X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=priv%2Fstatic%2Findex.html;h=1f081eed49ee5a4b0ed6c4c130193eb8735676ae;hb=7de32e2c8b77eba414d376dedfdb8f782847ce46;hp=04c088f0600173778b05d9c1cbab762672285dc4;hpb=1eec8d3dee3a696ce23a8ae68e122f4c959294b1;p=akkoma
diff --git a/priv/static/index.html b/priv/static/index.html
index 04c088f06..1f081eed4 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1 +1,5 @@
-Pleroma
\ No newline at end of file
+<<<<<<< HEAD
+Pleroma
+=======
+Pleroma
+>>>>>>> 544bdbfb90d764a5aba8ed07c13b842838d76d73