Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15

# Conflicts: # services/build.gradle
2019-03-20 22:28:51 -06:00
parent f35777b5a6
commit f5f959b453
3 changed files with 15 additions and 22 deletions
@@ -3,9 +3,6 @@ plugins {
    id 'java'
 }

-apply plugin: 'io.spring.dependency-management'
-apply plugin: 'org.springframework.boot'
-
 description = 'Provides database access and connectivity'
 group 'edu.msudenver.tsp'
 version '1.0'