From: Testelocker Server <testelocker@jhpolice.gov.in>
Date: Tue, 20 Jun 2017 15:59:14 +0530
Subject: Merge branch 'develop' of https://openforge.gov.in/plugins/git/digitallocker/development_auth_partner_sm_app into develop
---
Merge branch 'develop' of https://openforge.gov.in/plugins/git/digitallocker/development_auth_partner_sm_app into develop

Conflicts:
	xml/hashKey.xml
	xml/hashhkey.xml
---


--- 'a/.gitignore'
+++ b/.gitignore
@@ -69,4 +69,6 @@ user_guide_src/cilexer/pycilexer.egg-inf
 .DS_Store
 
 config.php
-xml/*
\ No newline at end of file
+/xml/**
+xml/hashKey.xml
+xml/hashhkey.xml
\ No newline at end of file

--- 'a/footer.php'
+++ b/footer.php
@@ -35,7 +35,7 @@
 <!-- /.container -->
 <!-- jQuery -->
 <!-- Bootstrap Core JavaScript -->
-<script src="js/jquery.min.js"></script>
+
 <script src="js/bootstrap.min.js"></script>
 </body>
 </html>
\ No newline at end of file

--- 'a/header.php'
+++ b/header.php
@@ -223,6 +223,7 @@
             </div>
             <!-- /.container -->
         </nav>
+        <script src="js/jquery.min.js"></script>
         <script>
             $(document).ready(function () {
                 $('.dropdown-submenu a.test').on("click", function (e) {