From: Development-DLA <suman@digitalindia.gov.in>
Date: Mon, 17 Jul 2017 16:34:22 +0530
Subject: conflict file
---
conflict file
---


--- 'a/.gitignore'
+++ b/.gitignore
@@ -69,7 +69,6 @@ user_guide_src/cilexer/pycilexer.egg-inf
 .DS_Store
 
 config.php
-xml/*
-/xml/*
+
 xml/hashKey.xml
 xml/hashhkey.xml

--- 'a/xml/hashKey.xml'
+++ b/xml/hashKey.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <maincontent>
-  <code num=""/>
-  <access_token></access_token>
+  <code num="db1d71040290edefc6152f6a756667959a372bfa"/>
+  <access_token>a6aad62eff83942c5c044abf00e92b48c25cbd44</access_token>
 </maincontent>

--- /dev/null
+++ b/xml/hashhKey.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<maincontent>
+  <code num=""/>
+  <access_token></access_token>
+</maincontent>