From 6b6a6d98b773cd6876f98607a8f5db543650cb48 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 25 Sep 2015 14:57:40 +0300
Subject: [PATCH] Add additional line which shouldn't be modified after
 commenting in other branches to make git auto-merge possible

---
 update_dependencies.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/update_dependencies.xml b/update_dependencies.xml
index 99e26b7c39d..700761e0145 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -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}"/>