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

# Conflicts: # services/build.gradle
2019-03-20 22:00:11 -06:00
parent 5479130178 b15ef858b0
commit 749a20c0fd
48 changed files with 1323 additions and 586 deletions
@@ -4,18 +4,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
-
 public class Application {

-    public static void main(final String[] args)
-    {
+    public static void main(final String[] args) {
        SpringApplication.run(Application.class, args);
    }
-
 }
-
-
-
-
-
-