what a nightmare

5 months ago · 1335803f20
parent 545de3677b
commit 1335803f20
1 changed files with 0 additions and 5 deletions
--- a/layouts/partials/extend-head.html
+++ b/layouts/partials/extend-head.html
@ -1,6 +1 @@
-<<<<<<< HEAD
-<script defer data-domain="blog.ndumas.com" src="https://analytics.ndumas.com/js/script.js"></script>
-||||||| 91f5123
-=======
 <script defer data-domain="{{ index .Site.Params.AnalyticsURL urls.AbsURL}}" src="https://analytics.ndumas.com/js/script.js"></script>
->>>>>>> dev