fix: interoperability with go repo - added tests

vasco-santos · vasco-santos · commit f67adf8ebcd4 · 2018-08-09T14:07:29.000+01:00
diff --git a/src/default-datastore.js b/src/default-datastore.js
@@ -2,6 +2,12 @@
 
 // Default configuration for the datastore spec in node.js
 module.exports = {
+<<<<<<< HEAD
+=======
+  StorageGCWatermark: 90,
+  GCPeriod: '1h',
+  BloomFilterSize: 0,
+>>>>>>> fix: interoperability with go repo - added tests
   Spec: {
     type: 'mount',
     mounts: [
