Removed unnecessary files from git merging manually

index.toml

@@ -295,10 +295,6 @@ file = "mods/crafttweaker.pw.toml"
 hash = "c81c390b0ef760626eb73aba959cfca1494c259c92587c722bcff815cae0ad95"
 metafile = true
 
-[[files]]
-file = "mods/crafttweaker.pw.toml.orig"
-hash = "b71969ad12d289741b21a10c09d00cc1d6f896ecc13592b7fa3f95b58d23a5f0"
-
 [[files]]
 file = "mods/create-big-cannons.pw.toml"
 hash = "7d8fe92da9ff5b1a8d370c5e68c2e29ba68b400660266347106d7d9ec6f71182"
@@ -1169,10 +1165,6 @@ file = "mods/zoomify.pw.toml"
 hash = "6e3c46cc7523df95fefba675b177ff0abfda3b72c893add5ce64390ad137ab8f"
 metafile = true
 
-[[files]]
-file = "pack.toml.orig"
-hash = "a7544ab94c1d7b84c36c72ddbeadd11767164fa885668605846a69839a72b445"
-
 [[files]]
 file = "resourcepacks/RegalityResourcePack.zip"
 hash = "7c627985b33d5d4458a4532b53a4bfc0e78f69ebb0614e178d7cddbc7714c999"

mods/crafttweaker.pw.toml.orig

@@ -1,27 +0,0 @@
-name = "CraftTweaker"
-<<<<<<< HEAD
-filename = "CraftTweaker-fabric-1.20.1-14.0.40.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/WG2ODwLU/CraftTweaker-fabric-1.20.1-14.0.40.jar"
-hash-format = "sha1"
-hash = "ebd455b9251a142ddddd18288e75c2aa0ce4e20b"
-=======
-filename = "CraftTweaker-fabric-1.20.1-14.0.43.jar"
-side = "both"
-
-[download]
-url = "https://cdn.modrinth.com/data/Xg35A4rS/versions/gdH7ia6f/CraftTweaker-fabric-1.20.1-14.0.43.jar"
-hash-format = "sha1"
-hash = "cacbbf22e3e43a022ad42102a34f81e92819e5ef"
->>>>>>> develop
-
-[update]
-[update.modrinth]
-mod-id = "Xg35A4rS"
-<<<<<<< HEAD
-version = "WG2ODwLU"
-=======
-version = "gdH7ia6f"
->>>>>>> develop

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "e2aaabed3e14a119917c76e69a481c6b30bdfd1115cfa9c8a19a13d7a96fff05"
+hash = "b214a5e03bf5b717c152123c8c1b514262758feb240abb292913dc4a431bf362"
 
 [versions]
 fabric = "0.15.11"