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 15:11
Testelocker Server 2017-06-22 15:11
43551df6844ca24385703c5b5da5236611529022
00021c3939dc70537f62ca4519a581b0e6a33136
git #authpartner/43551df6844ca24385703c5b5da5236611529022

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="96858eb0ae6e8bf2a7d039884607e64123491d93"/>
- <access_token>b22b8855d8181f04d13e365e931555c903af71e5</access_token>
-=======
<code num="20ed1cc268156605f5281a52e2adf5c1c4b2c083"/>
<access_token>f3d904f5c239c28b620e28dad6265fbad321b029</access_token>
->>>>>>> b79261665b00b1e2d582f3671952cc8bd3cd11b5
</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="4a0bb790b1f7509e18264a363dcab2d09bf9a016"/>
- <access_token>72ffd3b88365481579eadbb19518935d7a43ef09</access_token>
-=======
<code num="7ba70ff76b57de95f1643ee669affb27c5c5ec5c"/>
<access_token>86a8123cb941790bedf2c2f9d97d389375f5a420</access_token>
->>>>>>> b79261665b00b1e2d582f3671952cc8bd3cd11b5
</maincontent>