Feat: update to v1.1.48

module.json

@@ -6,7 +6,7 @@
       "name": "Nibur"
     }
   ],
-  "version": "1.1.47",
+  "version": "1.1.48",
   "compatibility": {
     "minimum": "11",
     "verified": "11.313",
@@ -14,7 +14,7 @@
   },
   "url": "https://gitlab.j-linn.de/Yoshi/germandndcompendium",
   "manifest": "https://gitlab.j-linn.de/Yoshi/germandndcompendium/-/raw/master/module.json",
-  "download": "http://gitlab.j-linn.de/Yoshi/germandndcompendium/-/archive/v1.1.47/germandndcompendium-v1.1.47.zip",
+  "download": "http://gitlab.j-linn.de/Yoshi/germandndcompendium/-/archive/v1.1.48/germandndcompendium-v1.1.48.zip",
   "changelog": "https://gitlab.j-linn.de/Yoshi/germandndcompendium/-/blob/master/changelog.md",
   "packs": [
     {
@@ -108,11 +108,6 @@
       "system": "dnd5e",
       "path": "packs/Subclass"
     }
-<<<<<<< HEAD
   ],
   "id": "SharedData_global"
 }
-=======
-  ]
-}
->>>>>>> 437464ddb1c200a3db307a78fbaf671763fc6015