layouts/partials/header.html

@@ -32,7 +32,7 @@
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
             integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
             crossorigin="anonymous" />
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <link rel="stylesheet" href="{{ "css/main.css" | absURL }}">
         <link rel="stylesheet" href="{{ "css/custom.css" | absURL }}">
 

renovate.json

@@ -1,15 +1,3 @@
 {
-<<<<<<< HEAD
   "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-=======
-  "extends": [
-    "config:base"  
-  ],
-  "packageRules": [
-    {
-      "updateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    }
-  ]
->>>>>>> 223f4c6 (fixed pinterest icon and link)
 }