removing diff string

brunoventura · brunoventura · commit a62080c54fc0 · 2016-03-01T04:16:38.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,5 @@ node_modules
 
 # Optional REPL history
 .node_repl_history
->>>>>>> b98f6a419c2b5cf9f301e9a9b0f3ec9488a5a269
 
 config/production.json
