Resolve merge conflicts

danielv14 · Jul 2, 2019 · 887e41f · 887e41f
2 parents 0c140f2 + 1279b79
commit 887e41f
Show file tree

Hide file tree

Showing 2 changed files with 1,247 additions and 665 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: node server/index.js
+web: node server/index.js