From: Testelocker Server <testelocker@jhpolice.gov.in>
Date: Tue, 20 Jun 2017 17:39:56 +0530
Subject: conflict file
---
conflict file
---


--- 'a/footer.php'
+++ b/footer.php
@@ -31,11 +31,9 @@
         </div><!-- .container -->
     </footer>
 </div>
-<script language="javascript" charset="UTF-8" type="text/javascript" src="js/stats.js"></script>
 <!-- /.container -->
 <!-- jQuery -->
 <!-- Bootstrap Core JavaScript -->
-
 <script src="js/bootstrap.min.js"></script>
 </body>
 </html>
\ No newline at end of file

--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -116,7 +116,6 @@ $dataF = json_decode($resFileNew[1], TRU
                                                         </tr>
                                                     </thead>
                                                     <tbody  id="folderPath">
-                                                    <div id="loading" style="height:42px; width:56px; margin:0 auto;"></div>
                                                     <?php
                                                     foreach ((array) ($dataF['items']) as $api_detail) {
                                                         if (isset($api_detail['id'])) {

--- 'a/xml/hashKey.xml'
+++ b/xml/hashKey.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<maincontent>
-  <code num="24dfacffaa4aa27cd674cadb6a35a87455fb5ba1"/>
-  <access_token>92429a583136ed134cbb41f7eab3562d0a926d0e</access_token>
-</maincontent>

--- 'a/xml/hashhkey.xml'
+++ b/xml/hashhkey.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<maincontent>
-  <code num="e1134f28fd037eaa64fd8bf4f13cfef09cde9ee7"/>
-  <access_token>60b9e6cfa9a8a2b443d9e42c1373764428c71bf2</access_token>
-</maincontent>