FE

[akkoma] / priv / static / static / styles.json

diff --git a/priv/static/static/styles.json b/priv/static/static/styles.json
index 9ebc60eaa6336b73d621852add25ef62cc77bc1f..4c564d125d958c5e6e59c641e1f91369769d51da 100644 (file)
--- a/priv/static/static/styles.json
+++ b/priv/static/static/styles.json
@@ -11,9 +11,6 @@
   "redmond-xxi": "/static/themes/redmond-xxi.json",
   "breezy-dark": "/static/themes/breezy-dark.json",
   "breezy-light": "/static/themes/breezy-light.json",
-<<<<<<< HEAD
-  "ihatebeingalive": "/static/themes/ihatebeingalive.json"
-=======
+  "ihatebeingalive": "/static/themes/ihatebeingalive.json",
   "mammal": "/static/themes/mammal.json"
->>>>>>> 8a03ce50ea30df3754f2d9856829b036c878e063
 }