Commit 6c997f9a authored by phil's avatar phil

remove merge conflict

parent 3e9db084
...@@ -132,7 +132,6 @@ states, this is a legal use for this font. ...@@ -132,7 +132,6 @@ states, this is a legal use for this font.
SSL certificates are taken care of by the Hetzner managed hosting. SSL certificates are taken care of by the Hetzner managed hosting.
It's a Symantec certificate. It's a Symantec certificate.
** TODOs ** TODOs
*** BUGS *** BUGS
...@@ -196,12 +195,6 @@ https://developers.google.com/speed/pagespeed/insights/?url=http%3A%2F%2F200ok.c ...@@ -196,12 +195,6 @@ https://developers.google.com/speed/pagespeed/insights/?url=http%3A%2F%2F200ok.c
- [X] There is now a =tags= task in Perun - [X] There is now a =tags= task in Perun
<<<<<<< HEAD
*** TODO on project page the technologies should not overflow the center area *** TODO on project page the technologies should not overflow the center area
=======
*** TODO fix categories in feed *** TODO fix categories in feed
*** TODO [#C] weirdly, adding a rss-feed seems to have fixed the order of entries in the atom-feed, albeit the order in the rss-feed seems to be wrong. wtf *** TODO [#C] weirdly, adding a rss-feed seems to have fixed the order of entries in the atom-feed, albeit the order in the rss-feed seems to be wrong. wtf
>>>>>>> master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment