Fix after merge

2026-08-25 11:11:46 +08:00 · 2015-09-03 14:56:54 +03:00
parent f6e2f781a2
commit 3bd9307bcf
1 changed files with 0 additions and 5 deletions
@@ -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);
                    }