From ab188967224ff2fe1fa75430d361d2b0b2dc0e45 Mon Sep 17 00:00:00 2001
From: Ashwin Kapur <ashwin.kapur@gmail.com>
Date: Tue, 17 May 2016 12:15:25 -0400
Subject: [PATCH] Added some notebooks.

---
 pyiqfeed/exceptions.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyiqfeed/exceptions.py b/pyiqfeed/exceptions.py
index 437a9b6..e4d23f4 100644
--- a/pyiqfeed/exceptions.py
+++ b/pyiqfeed/exceptions.py
@@ -1,7 +1,3 @@
 
 class NoDataError(KeyError):
-<<<<<<< HEAD
     pass
-=======
-    pass
->>>>>>> f8ff3759e2c997ea48a12fa939d98912142e59ff