Motschen/Blur
1
0
Fork 0
mirror of https://github.com/Motschen/Blur.git synced 2025-12-16 11:45:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
tterrag1098
2017-05-30 01:37:38 -04:00
parent fc7cafa6f8
commit 01769d6990
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

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