From fb0e73184ff841e7eb9693c04dbdf9a6786712e3 Mon Sep 17 00:00:00 2001
From: Sushil <sushil@knoldus.com>
Date: Thu, 2 Apr 2015 19:02:45 +0530
Subject: [PATCH] #27 resolved

---
 app/controllers/Application.scala | 4 ----
 app/views/header.scala.html       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
index 0af17c0..719961e 100644
--- 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
index 23f39af..5f1a0b5 100644
--- 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>