resolving conflict..

sachin-maheshwari · sachin-maheshwari · commit f7dc080863ad · 2018-07-27T12:38:21.000+05:30
diff --git a/README.md b/README.md
@@ -186,3 +186,4 @@ JavaScript
 
 Creating New Views/Pages
   - To add a new page, create a folder in the app directory and follow the naming conventions found elsewhere, e.g. `login.controller.js`, `login.jade`, `login.spec.js`, etc.  Make sure to add a new state in the submodule's routes file.
+  

Original file line number	Diff line number	Diff line change
`@@ -186,3 +186,4 @@ JavaScript`
`186`	`186`
`187`	`187`	`Creating New Views/Pages`
`188`	`188`	- To add a new page, create a folder in the app directory and follow the naming conventions found elsewhere, e.g. `login.controller.js`, `login.jade`, `login.spec.js`, etc. Make sure to add a new state in the submodule's routes file.
	`189`	`+`