From f28418a8ca1572e32a4e4091c5e84dff0f5cacbe Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Sat, 6 Apr 2019 16:16:13 +0200
Subject: [PATCH] Merged develop into max/backend

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6ebd538..1a8425f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,15 +35,15 @@ dependencies {
     //JSON Parser
     implementation 'com.google.code.gson:gson:2.8.5'
 
-<<<<<<< HEAD
+
     compile 'org.springframework.boot:spring-boot-starter-tomcat'
     compile 'org.springframework.boot:spring-boot-starter-security'
     compile 'org.springframework.boot:spring-boot-starter-actuator'
     compile 'org.springframework.boot:spring-boot-starter-aop'
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.2.0.RELEASE'
-=======
+
     compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE'
->>>>>>> develop
+
 
     //JWT
     compile 'io.jsonwebtoken:jjwt-api:0.10.5'