diff options
| author |  Vitaly Takmazov | 2016-07-07 11:30:38 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-07-07 11:30:38 +0300 |
| commit | a8b38ca23e9b43527e85b0dbf5c9267401fd3c69 (patch) | |
| tree | 31e174ec9aaeb04faf8fe057bbd6de44fcf77ebe /build.gradle | |
| parent | a93c85c5ea1bf6683f604bef2608053957577ff0 (diff) | |
| parent | fb4dfa3fbc04e44e808bbd4d1ad764fa979bb3ca (diff) | |
merge core
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle index ea42cc55..f2bc16ab 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ +<<<<<<< HEAD subprojects { apply plugin: 'java' repositories { @@ -117,3 +118,6 @@ gretty { contextPath = '' servletContainer = 'tomcat8' } +======= +apply plugin: "java" +>>>>>>> core/develop |