pls work

BSData · Feb 3, 2024 · e292b79 · e292b79
1 parent c345589
commit e292b79
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Death - Flesh-eater Courts.cat b/Death - Flesh-eater Courts.cat
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<<<<<<< HEAD
 <catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6d29-cde4-372b-08d3" name="Death - Flesh-eater Courts" revision="104" battleScribeVersion="2.03" authorName="https://discord.gg/4MSsD7" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
-=======
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6d29-cde4-372b-08d3" name="Death - Flesh-eater Courts" revision="103" battleScribeVersion="2.03" authorName="https://discord.gg/4MSsD7" authorUrl="https://github.com/BSData/warhammer-age-of-sigmar" library="false" gameSystemId="e51d-b1a3-75fc-dc33" gameSystemRevision="161" type="catalogue">
 
->>>>>>> bd26cb22f3e59b97fb68a7f76e6484e820c215b0
   <publications>
     <publication id="6d29-cde4-pubN65537" name="Battletome: Flesh-eater Courts 2019"/>
     <publication id="6d29-cde4-pubN65555" name="Battletome: Flesh-eater Courts"/>