NashTech-Labs#27 resolved

ujali · Apr 2, 2015 · fb0e731 · fb0e731
1 parent 1abc78c
commit fb0e731
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -31,11 +31,7 @@ def index: Action[play.api.mvc.AnyContent] = Action { implicit request =>
 def javascriptRoutes: Action[play.api.mvc.AnyContent] = Action { implicit request =>
     import routes.javascript._
     Ok(Routes.javascriptRouter("jsRoutes")(
-<<<<<<< HEAD
       routes.javascript.MobileController.checkMobileStatus,
-=======
-      routes.javascript.MobileController.checkStatus,
->>>>>>> 593546736364d9be5213d73f12641e86327f8ce8
       routes.javascript.MobileController.getModels,
       routes.javascript.MobileController.isImeiExist,
       routes.javascript.AdminController.pending,

diff --git a/app/views/header.scala.html b/app/views/header.scala.html
@@ -48,7 +48,7 @@
 					<li><a id="createMobileModel" href="/admin/modelRegistrationForm">Add Mobile Model</a></li>
 					<li><a id="createMobileModel" href="/admin/changeMobileRegType">Change Status</a></li>
 					<li><a href="/admin/mobiles?status=pending">List of Requests</a></li>
-					<li><a href="/auditpage">Audit</a></li>					
+					<li><a href="admin/auditpage">Audit</a></li>					
 					<li><a id="logout" href="/logout">Logout</a></li>
 					</ul>
 					</li>