Removed unnecessary files from git merging manually

This commit is contained in:
2024-08-30 21:23:08 -04:00
parent 113474e973
commit f55bd74245
3 changed files with 1 additions and 36 deletions

View File

@@ -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"