summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:15:05 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:15:05 +0100
commitf5d3c9d28196a1678647fe3239fa3eaf633e6c41 (patch)
tree9f04cee73b8f5080925cbf1ec09768cd12e20664
parentdde16108dd8e7ed6159aadd304c5fb8ced36e517 (diff)
downloadtroggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.tar.gz
troggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.tar.bz2
troggle-f5d3c9d28196a1678647fe3239fa3eaf633e6c41.zip
[svn] Fix edit conflict screwup
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8041 by aaron @ 10/27/2008 6:12 PM
-rw-r--r--parsers/cavetab.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/parsers/cavetab.py b/parsers/cavetab.py
index b4df13e..0bdac72 100644
--- a/parsers/cavetab.py
+++ b/parsers/cavetab.py
@@ -4,11 +4,8 @@ import settings
import expo.models as models
import csv
import time
-<<<<<<< .mine
+
#import sqlite3
-=======
-# import sqlite3
->>>>>>> .r8038
import re
import os
@@ -65,13 +62,8 @@ 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"