fix

clementmiao · Mar 12, 2014 · 9955336 · 9955336
1 parent 2ae8ce9
commit 9955336
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -14,4 +14,3 @@ facepy==0.9.0
 =======
 python-instagram==0.8.0
 facepy==0.9.0
->>>>>>> e8b25ea855f0fa7de558e1bce5ba58fdbfd4e77b