Fix bad merge

This commit is contained in:
tterrag1098
2017-05-30 01:37:38 -04:00
parent fc7cafa6f8
commit 01769d6990

View File

@@ -13,11 +13,7 @@ plugins {
apply plugin: 'net.minecraftforge.gradle.forge'
boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
<<<<<<< Updated upstream
ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
=======
ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom'
>>>>>>> Stashed changes
group = 'com.tterrag.blur'
archivesBaseName = "Blur"