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

xml

Download Browse
+0 −10
Testelocker Server 2017-06-22 14:57
Testelocker Server 2017-06-22 14:57
236eed3cbebde116700a7d56cae7fc335ded3d1b
eda9bb086a101b1b364ee025045c4db9a5a6d4d1
git #authpartner/236eed3cbebde116700a7d56cae7fc335ded3d1b

Modified Files

List
Side by side diff
M xml/hashKey.xml
+0 −5
--- 'a/xml/hashKey.xml'
+++ b/xml/hashKey.xml
@@ -1,10 +1,5 @@
<?xml version="1.0"?>
<maincontent>
-<<<<<<< HEAD
- <code num="7bd9eb3c9084f17ca38abde4f23dfd133c2c3d73"/>
- <access_token>1770bcbfdc625d53c2f1d6dffe74776d0d6531a7</access_token>
-=======
<code num="96858eb0ae6e8bf2a7d039884607e64123491d93"/>
<access_token>b22b8855d8181f04d13e365e931555c903af71e5</access_token>
->>>>>>> develop
</maincontent>
M xml/hashhkey.xml
+0 −5
--- 'a/xml/hashhkey.xml'
+++ b/xml/hashhkey.xml
@@ -1,10 +1,5 @@
<?xml version="1.0"?>
<maincontent>
-<<<<<<< HEAD
- <code num="8bbec65edd9743663899037e763649369b00c710"/>
- <access_token>019eecc37ea5b7bce1343eb34db4c76a9e48a63a</access_token>
-=======
<code num="4a0bb790b1f7509e18264a363dcab2d09bf9a016"/>
<access_token>72ffd3b88365481579eadbb19518935d7a43ef09</access_token>
->>>>>>> develop
</maincontent>