3 changed files with 1 additions and 6 deletions
--- a/a.apk
+++ b/a.apk
--- a/index.html
+++ b/index.html
@ -1,7 +1,2 @@
-<<<<<<< Updated upstream
 <a href="app-debug.apk">debug</a>
-<a href="app-release.apk">release</a>
-=======
-<a href="app-debug.apk">hello world</a>
-<a href="a.apk">hello world</a>
->>>>>>> Stashed changes
+<a href="app-release.apk">release</a>
--- a/nginx.htaccess
+++ b/nginx.htaccess