Commit 6c997f9a authored by phil's avatar phil

remove merge conflict

parent 3e9db084
...@@ -52,13 +52,13 @@ out more about structured data on Googles [[https://developers.google.com/search ...@@ -52,13 +52,13 @@ out more about structured data on Googles [[https://developers.google.com/search
**** Optional SEO attributes **** Optional SEO attributes
The following attributes can be set on a pots and will benefit your The following attributes can be set on a pots and will benefit your
SEO strategy: SEO strategy:
- =description=: Short description of the post - =description=: Short description of the post
- =featured_image=: Shows up when sharing a link - =featured_image=: Shows up when sharing a link
**** Checks **** Checks
- If you used a new Category within your Post, make sure to also link - If you used a new Category within your Post, make sure to also link
...@@ -118,7 +118,7 @@ TODO generate the wordlist from project metadata ...@@ -118,7 +118,7 @@ TODO generate the wordlist from project metadata
#+END_SRC #+END_SRC
** Fonts ** Fonts
We are using the "Abril Fatface" font for headers. It comes with the We are using the "Abril Fatface" font for headers. It comes with the
[[https://www.fontsquirrel.com/fonts/abril-fatface][SIL Open Font License]] which states that the font is free to use, but [[https://www.fontsquirrel.com/fonts/abril-fatface][SIL Open Font License]] which states that the font is free to use, but
it cannot be used under the original name. Therefore we downloaded the it cannot be used under the original name. Therefore we downloaded the
...@@ -128,11 +128,10 @@ while renaming the font to "Header Font". As far as the documentation ...@@ -128,11 +128,10 @@ while renaming the font to "Header Font". As far as the documentation
states, this is a legal use for this font. states, this is a legal use for this font.
** SSL ** SSL
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