Merge branch 'master' into patch-1

fullstackopen-2019 · Aug 28, 2019 · c768f10 · c768f10
2 parents a1c8f12 + 4611baa
commit c768f10
Show file tree

Hide file tree

Showing 3 changed files with 529 additions and 600 deletions.
diff --git a/README.md b/README.md
@@ -3,3 +3,5 @@
 Run frontend in development mode with _npm start_
 
 Start server to port 3005 with _npm run server_
+
+If you encounter trouble running npm install, remove package-lock.json and try again.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,5 @@
		Run frontend in development mode with _npm start_

		Start server to port 3005 with _npm run server_

		If you encounter trouble running npm install, remove package-lock.json and try again.