From 3bd9307bcfd9d63962487bf34f6775131cff202c Mon Sep 17 00:00:00 2001
From: Igor Kriklivetc <igor.kriklivets@hotmail.com>
Date: Thu, 3 Sep 2015 14:56:54 +0300
Subject: [PATCH] Fix after merge

---
 devextreme/dx.devextreme-tests.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/devextreme/dx.devextreme-tests.ts b/devextreme/dx.devextreme-tests.ts
index 31dfd3593..2aad878f1 100644
--- a/devextreme/dx.devextreme-tests.ts
+++ b/devextreme/dx.devextreme-tests.ts
@@ -105,13 +105,8 @@ module Tests.ui {
                         $('<div/>').dxAutocomplete({
                             dataSource: ["Bern", "Lyon", "Lander"],
                             value: options.value,
-<<<<<<< HEAD
                             onValueChanged: function () {
                                 options.setValue("test-value");
-=======
-                            onValueChanged: function (e:{ value: string }) {
-                                options.setValue(e.value);
->>>>>>> upstream/master
                             }
                         }).appendTo(container);
                     }