Add additional line which shouldn't be modified after commenting in other branches to make git auto-merge possible
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
<project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
|
||||
|
||||
<property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
|
||||
<property name="ideaVersion" value="142.5047.6"/>
|
||||
|
||||
|
||||
<property name="kotlin.bootstrap.branch" value=""/>
|
||||
<property name="kotlin.bootstrap.branch.locator" value=""/>
|
||||
<property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS${kotlin.bootstrap.branch.locator}"/>
|
||||
|
||||
Reference in New Issue
Block a user