diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:47:49 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:47:49 +0800 |
| commit | 9d0f6526694ef18a657c1df0b4a23917344c3567 (patch) | |
| tree | 5547a5a3e16a4614f0e11b8fc59d6c081de90710 /src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java | |
| parent | 07bc4eab7b23fee28d0036890337c5af97cc3d2f (diff) | |
| download | architectury-loom-9d0f6526694ef18a657c1df0b4a23917344c3567.tar.gz architectury-loom-9d0f6526694ef18a657c1df0b4a23917344c3567.tar.bz2 architectury-loom-9d0f6526694ef18a657c1df0b4a23917344c3567.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java index 2cc68401..728a109f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java @@ -28,13 +28,13 @@ import java.util.Optional; import java.util.jar.Attributes; import java.util.jar.Manifest; +import dev.architectury.tinyremapper.TinyRemapper; import org.gradle.api.Project; import org.gradle.util.GradleVersion; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.util.Constants; -import net.fabricmc.tinyremapper.TinyRemapper; public final record JarManifestConfiguration(Project project) { public void configure(Manifest manifest) { |