diff options
author | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
commit | 695863367fb42d6435a36aea9290cb9eb1638ced (patch) | |
tree | a4f6b94be3632d880245c064dbf99ead5a64f83e /src/test/groovy/net | |
parent | cea80b01195be2ab6bd5cdadbcf7fa7b2972e131 (diff) | |
download | architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.gz architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.bz2 architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.zip |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/test/groovy/net')
-rw-r--r-- | src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy index addc6f49..e013170a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy @@ -111,7 +111,7 @@ class LayeredMappingSpecBuilderTest extends Specification { } LayeredMappingSpec layeredAction(Action<LayeredMappingSpecBuilder> action) { - LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder() + LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder(null) action.execute(builder) return builder.build() } |