fix merge conflicts in app.json

mercyoseni · Mar 25, 2017 · 40a475d · 40a475d
2 parents 3800d25 + 3e822af
commit 40a475d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app.json b/app.json
@@ -14,4 +14,4 @@
       "url": "heroku/nodejs"
     }
   ]
-}
+}