Permalink
Browse files

Merge resolved

  • Loading branch information...
1 parent 9355cb4 commit 94ba4e5a5ff806dee030507a4d742be1b1a3fdd4 @mihneasim committed Aug 4, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 django_zopeproductversions/client.py
@@ -269,11 +269,7 @@ def update_errors(self, instance, portal=None, json_str=''):
error_type=hashes[hash][0]['error_type'],
portal=portal,
url=portal.url + hashes[hash][0]['url'],
-<<<<<<< HEAD
- date=datetime.fromtimestamp(float(hashes[hash][0]['date'])),
-=======
date=datetime.datetime.fromtimestamp(float(hashes[hash][0]['date'])),
->>>>>>> new feature: personal commit record registry
traceback=hashes[hash][0]['traceback'],
count=len(hashes[hash])
)

0 comments on commit 94ba4e5

Please sign in to comment.