1 files changed, 10 insertions, 1 deletions
diff --git a/parsers/cavetab.py b/parsers/cavetab.py
index 55311ac..b4df13e 100644
--- a/parsers/cavetab.py
+++ b/parsers/cavetab.py
@@ -4,7 +4,11 @@ import settings
 import expo.models as models
 import csv
 import time
+<<<<<<< .mine
+#import sqlite3
+=======
 # import sqlite3
+>>>>>>> .r8038
 import re
 import os
 
@@ -61,8 +65,13 @@ caveReader = csv.reader(cavetab)
 caveReader.next() # Strip out column headers
 
 
+<<<<<<< .mine
+def save(x):   #There seems to be an intermitent problem with sqlite and Vista, uncomment the lines below and the "import sqlite3" above to fix it
+#    try:
+=======
 def save(x):   #There seems to be an intermitent problem with sqlite and Vista, uncomment the lines below, and the import sqlite3 statment above to fix it
 #    try:
+>>>>>>> .r8038
         x.save()
 #    except sqlite3.OperationalError:
 #        print "Error"
@@ -269,4 +278,4 @@ for line in caveReader :
             entrance_letter = ''
 
         newCaveAndEntrance = models.CaveAndEntrance(cave = newCave, entrance = newEntrance, entrance_letter = entrance_letter)
-        save(newCaveAndEntrance)
-\ No newline at end of file
+        save(newCaveAndEntrance)