Merge pull request #15 from azim254/master

StanleyMasinde · web-flow · commit 0c9f856d9645 · 2020-03-18T18:24:52.000+03:00
Update README &amp;&amp; fixed Conflicts
diff --git a/README.md b/README.md
@@ -9,8 +9,11 @@
 # install dependencies
 $ npm install
 
+#run locally
+$ npm start
+
 # serve with hot reload at localhost:3000
-$ npm run dev
+$ npm run dev 
 
 # build for production and launch server
 $ npm run build
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensource-254",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "official website for opensource254. (made in Kenya)",
   "author": "Opensource 254",
   "private": true,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "opensource-254",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "official website for opensource254. (made in Kenya)",`
`5`	`5`	`"author": "Opensource 254",`
`6`	`6`	`"private": true,`