X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=priv%2Fstatic%2Findex.html;h=c0952e09c0c5f8f9bc838a30b7ffca07508e4e9d;hb=8550e0ff0a0108adb0f74a3781be381bc20a4462;hp=6e84ec3da47777e6b4303a457695eb8491f52393;hpb=87ba9d1babfcdbcc4661fb92edc372ef936da39f;p=akkoma
diff --git a/priv/static/index.html b/priv/static/index.html
index 6e84ec3da..c0952e09c 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pleroma
-=======
-Pleroma
->>>>>>> 456668b490e9ee47cf773a8563a9f3a3765ce348
+Pleroma
\ No newline at end of file