Added some notebooks.

erickmiller · May 17, 2016 · ab18896 · ab18896
1 parent b56986a
commit ab18896
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pyiqfeed/exceptions.py b/pyiqfeed/exceptions.py
@@ -1,7 +1,3 @@
 
 class NoDataError(KeyError):
-<<<<<<< HEAD
     pass
-=======
-    pass
->>>>>>> f8ff3759e2c997ea48a12fa939d98912142e59ff