From bb2bcbace484f2696f2fd60ebcd39ee42cb5aee9 Mon Sep 17 00:00:00 2001
From: Sebastien <seb6596@gmail.com>
Date: Thu, 1 Mar 2018 12:52:31 +0100
Subject: [PATCH 1/2] edit gitattr

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 6d99763..3c8fdee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 Jenkinsfile merge=ours 
+Dockerfile merge=ours

From bca69f8a52b01adab1a62d6ab4c901b4110a491b Mon Sep 17 00:00:00 2001
From: Sebastien <seb6596@gmail.com>
Date: Thu, 1 Mar 2018 12:55:52 +0100
Subject: [PATCH 2/2] Edit Jenkinsfile

---
 .gitattributes | 2 +-
 Jenkinsfile    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 3c8fdee..6428bbf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 Jenkinsfile merge=ours 
-Dockerfile merge=ours
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 696ca4b..1a3f52a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ node {
     def app
    stage('Clone') { // for display purposes
       // Get some code from a GitHub repository
-      git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'devel'
+      git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git'
    }
    stage('Gradle Buil'){
         build job: 'Bot Discord Gradle', wait: true
@@ -18,7 +18,7 @@ node {
          * First, the incremental build number from Jenkins
          * Second, the 'latest' tag.
          * Pushing multiple tags is cheap, as all the layers are reused. */
-        app.push("devel")
+        app.push()
         
     }
     stage('Cleaning'){