Fixed conflict.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/db.py b/src/db.py
index 86c6f24..92684c8 100755
--- a/src/db.py
+++ b/src/db.py
@@ -46,18 +46,18 @@ class DictDB():
         return self._ts
 
     def add(self, data, batch_write=False):
-        key = str(self.unique_key())
+        keys = []
 
         if type(data) is list:
             for item in data:
-                item['_id'] = str(self._ts)
+                item['_id'] = str(self.unique_key())
 
                 self.couchdb.save(item)
         else:
-            data['_id'] = str(self._ts)
+            data['_id'] = str(self.unique_key())
             self.couchdb.save(data)
 
-        return key
+        return keys
 
     def get(self, key):
         return self.couchdb[key]