From 01769d69903a3010a4cac7eeaeaac7e643eec778 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Tue, 30 May 2017 01:37:38 -0400
Subject: [PATCH] Fix bad merge

---
 build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a87b5ae..231eb48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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"