Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

authpartner

Clone or download

conflict file

Download Browse
+8 −4
Suman Prasad (sumandigi) 2017-07-17 16:34
Suman Prasad (sumandigi) 2017-07-17 16:34
fbc90ba0e0aa78111dd607b47d8405e987d9f9a4
git #authpartner/fbc90ba0e0aa78111dd607b47d8405e987d9f9a4

Modified Files

List
Side by side diff
M .gitignore
+1 −2
--- '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
M xml/hashKey.xml
+2 −2
--- '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>
A xml/hashhKey.xml
+5 −0
--- /dev/null
+++ b/xml/hashhKey.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<maincontent>
+ <code num=""/>
+ <access_token></access_token>
+</maincontent>