X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fhead.tpl;h=2ef1bfe08fdd27ea30f5a3c493301bed5f0ef3d3;hb=a5aa44f18995ed3370d04941ea4c04f56450d9a4;hp=eaec270364ba7a4befad7883a80c28b437876ad0;hpb=c555343d669499cab2c2d2f18c40cc251891e69e;p=friendica.git
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index eaec270364..2ef1bfe08f 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -8,17 +8,17 @@
-{{foreach $stylesheets as $stylesheetUrl}}
-
+{{foreach $stylesheets as $stylesheetUrl => $media}}
+
{{/foreach}}
-
+
-
-
-
-
-
+
+
+
+
+
-<<<<<<< HEAD
-
-=======
-
->>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency
+
-
+
-
+