chore: minor refactor

vasco-santos · vasco-santos · commit 7a75adc369ea · 2018-08-09T14:07:29.000+01:00
diff --git a/src/default-datastore.js b/src/default-datastore.js
@@ -2,12 +2,6 @@
 
 // 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: [
