diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:56:18 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:56:18 +0800 |
| commit | dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34 (patch) | |
| tree | 74f791c46f9145ae19300f36501fae3dbfc95739 /src/main/java/net/fabricmc/loom/configuration/mods | |
| parent | ec2b47fa140750c45038c0dfb8a4b06ac35cb456 (diff) | |
| download | architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.tar.gz architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.tar.bz2 architectury-loom-dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/mods')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index 533b16bb..b0629d69 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -50,7 +50,6 @@ import com.google.gson.JsonObject; import dev.architectury.tinyremapper.InputTag; import dev.architectury.tinyremapper.OutputConsumerPath; import dev.architectury.tinyremapper.TinyRemapper; -import org.apache.commons.io.IOUtils; import org.gradle.api.Project; import org.objectweb.asm.commons.Remapper; import org.zeroturnaround.zip.ZipUtil; |