summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@viserion.(none)>2013-04-30 15:28:53 +0000
committerroot <root@viserion.(none)>2013-04-30 15:28:53 +0000
commitdb2ed3606ba1171cafc3f8ff86b75b9f48bcb50e (patch)
treea77846c9754e76d730b532325beb0341a8c2a305
parent03f21b1abbae8962c81f46c01f1bb972fc7b2395 (diff)
parentd0965fd0b03d62dee17312454a87c7ba2e0ae363 (diff)
downloadIshtar-db2ed3606ba1171cafc3f8ff86b75b9f48bcb50e.tar.bz2
Ishtar-db2ed3606ba1171cafc3f8ff86b75b9f48bcb50e.zip
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
-rw-r--r--archaeological_operations/import_from_csv.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py
index 97d60e67c..b2f3e1578 100644
--- a/archaeological_operations/import_from_csv.py
+++ b/archaeological_operations/import_from_csv.py
@@ -663,7 +663,6 @@ def import_operations_csv(values, col_defs=OPE_COLS, update=True, person=None,
setattr(obj, k, default[k])
obj.save()
ope_postimportfix(op, args)
- raise
#transaction.commit()
errors = []