maybe

6 years ago · 444408e591
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -1 +1,5 @@
-node:yarn start 
+<<<<<<< HEAD
+node:yarn start 
+=======
+node:yarn start
+>>>>>>> 253463c2f8a6348609ea2bc6cf2992c3e2125f41