Commit f24ab260 authored by Saurabh Narayan Singh's avatar Saurabh Narayan Singh
Browse files

merge

parents cd693125 1e71805c
......@@ -24,3 +24,6 @@
/plugins-sdk/lib
test-results
gradle.properties
service.properties
modules/ideaService/ideaService-service/bin/service.properties
modules/*/*/src/resources/service.properties
......@@ -67,4 +67,5 @@
<ol>
<li> If you are new to Liferay developement go through the tutorial at https://dev.liferay.com/de/develop/tutorials/-/knowledge_base/7-0/developing-a-web-application.
<li> You can ask Liferay related questions on their forum at https://web.liferay.com/de/community/forums/-/message_boards/category/239390. </li>
<li> Use "git update-index --skip-worktree gradle.properties" to prevent the gradle.properties file from being overriden.
</ol>
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=ANALYSIS
build.number=78
build.date=1513951571334
build.auto.upgrade=true
\ No newline at end of file
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=GB
build.number=83
build.date=1513605328026
build.auto.upgrade=true
\ No newline at end of file
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=IDEA
build.number=216
build.date=1513605332790
build.auto.upgrade=true
\ No newline at end of file
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=IDEA
build.number=216
build.date=1513605332790
build.auto.upgrade=true
\ No newline at end of file
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=PROJECT
build.number=128
build.date=1513605335418
build.auto.upgrade=true
\ No newline at end of file
##
## Properties Override
##
#
# Specify where to get the overridden properties. Updates should not be made
# on this file but on the overridden version of this file.
#
include-and-override=${base.path}/service-ext.properties
##
## Build
##
build.namespace=SURVEY
build.number=227
build.date=1513605340239
build.auto.upgrade=true
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment