Fixed merge conflicts

2026-01-17 07:36:26 +01:00 · 2025-08-26 16:53:55 +02:00 · 2025-08-26 16:53:55 +02:00 · fa6d7d3f3d
commit fa6d7d3f3d
parent abe2654352
18 changed files with 0 additions and 90 deletions
--- a/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
+++ b/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
@ -53,13 +53,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754268237448,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054727,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943503629,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!TIUsIlTS1WkK5vr2"
 }
--- a/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
@ -49,13 +49,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754256077777,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054856,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943544886,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!NAFU9roaVG7f3RNJ"
 }
--- a/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
@ -45,13 +45,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754256112978,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054862,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943545973,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!bcNe5qP3o6CKadhK"
 }
--- a/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
+++ b/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
@ -49,13 +49,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754352806098,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054704,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943522722,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!M5mpGoAj8LRkylrY"
 }
--- a/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
+++ b/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
@ -45,13 +45,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754349604941,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054774,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943535524,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!wg1H0hROc2acHwZh"
 }
--- a/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
+++ b/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
@ -53,13 +53,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754322815758,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054765,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943514465,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!h161OSIK24Up4qNd"
 }
--- a/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
+++ b/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
@ -45,13 +45,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754349604941,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054790,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943536628,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!GLpRVxnY5E82khxH"
 }
--- a/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
+++ b/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
@ -57,13 +57,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754253538384,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054682,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943553625,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!qqQlgCqhOivUFoQn"
 }
--- a/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
+++ b/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
@ -57,13 +57,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754253587683,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054698,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943555081,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!4y9Ph7RsCIAbkwTk"
 }
--- a/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
+++ b/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
@ -57,13 +57,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754245881893,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054824,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943487549,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!rKRxFBlkbh9cDK8K"
 }
--- a/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
+++ b/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
@ -45,13 +45,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754323643089,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054771,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943515526,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!95QxNZwgyEm1LqdG"
 }
--- a/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
+++ b/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
@ -43,13 +43,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754174653653,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054841,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943465827,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_id": "ld8MIvk0xVJydSBz",
  "sort": 100000,
--- a/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
+++ b/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
@ -49,13 +49,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754246011733,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054833,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943488691,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!SUo8NPBPO8aN193u"
 }
--- a/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
+++ b/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
@ -53,13 +53,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754221346981,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054814,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943479431,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!xp0XMjYT85Q7E90o"
 }
--- a/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
+++ b/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
@ -45,13 +45,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754221102716,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054802,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943478132,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!W9hs5kxOWeY7eA4Q"
 }
--- a/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
+++ b/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
@ -49,13 +49,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754268318903,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054752,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943505016,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!zsUglcU4NgZ8tNgZ"
 }
--- a/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
+++ b/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
@ -49,13 +49,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754354451615,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054713,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943523928,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_key": "!items!y7ERWRIpJsdP9Re4"
 }
--- a/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
+++ b/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
@ -47,13 +47,8 @@
    "systemId": "daggerheart",
    "systemVersion": "1.1.0",
    "createdTime": 1754174655078,
-<<<<<<< HEAD
-    "modifiedTime": 1756034054850,
-    "lastModifiedBy": "vUIbuan0U50nfKBE"
-=======
    "modifiedTime": 1755943467695,
    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
->>>>>>> development
  },
  "_id": "XTSODVM8st75Os8M",
  "sort": 200000,