From: Testelocker Server <testelocker@jhpolice.gov.in>
Date: Thu, 22 Jun 2017 15:11:03 +0530
Subject: xml
---
xml
---


--- 'a/xml/hashKey.xml'
+++ b/xml/hashKey.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 <maincontent>
-<<<<<<< HEAD
-  <code num="96858eb0ae6e8bf2a7d039884607e64123491d93"/>
-  <access_token>b22b8855d8181f04d13e365e931555c903af71e5</access_token>
-=======
   <code num="20ed1cc268156605f5281a52e2adf5c1c4b2c083"/>
   <access_token>f3d904f5c239c28b620e28dad6265fbad321b029</access_token>
->>>>>>> b79261665b00b1e2d582f3671952cc8bd3cd11b5
 </maincontent>

--- 'a/xml/hashhkey.xml'
+++ b/xml/hashhkey.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 <maincontent>
-<<<<<<< HEAD
-  <code num="4a0bb790b1f7509e18264a363dcab2d09bf9a016"/>
-  <access_token>72ffd3b88365481579eadbb19518935d7a43ef09</access_token>
-=======
   <code num="7ba70ff76b57de95f1643ee669affb27c5c5ec5c"/>
   <access_token>86a8123cb941790bedf2c2f9d97d389375f5a420</access_token>
->>>>>>> b79261665b00b1e2d582f3671952cc8bd3cd11b5
 </maincontent>