fix(uiSelectSingle): Tagging without multiple with new tags doesn't works

karthicksundararajan · Bogaerts Kristof · commit 369339f80729 · 2016-11-29T14:11:09.000+01:00
Tagging in single select is not working which has been testing in latest version of angular. Here, I've just copied working version of code from uiSelectMultiple directive and removed some code which causes the problem. All the test has been passed. Examples are working fine Closes angular-ui#1409, angular-ui#890
diff --git a/src/uiSelectSingleDirective.js b/src/uiSelectSingleDirective.js
@@ -249,6 +249,7 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
               });
           }
       });
+<<<<<<< HEAD
       
       //Copied from uiSelectMultipleDirective
       function _findCaseInsensitiveDupe(arr) {
@@ -264,6 +265,8 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
 
         return hasDupe;
       }
+=======
+>>>>>>> 2641bf6... fix(uiSelectSingle): Tagging without multiple with new tags doesn't works
 
       //Copied from uiSelectMultipleDirective
       function _findApproxDupe(haystack, needle) {

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,7 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp`
`249`	`249`	`});`
`250`	`250`	`}`
`251`	`251`	`});`
	`252`	`+<<<<<<< HEAD`
`252`	`253`
`253`	`254`	`//Copied from uiSelectMultipleDirective`
`254`	`255`	`function _findCaseInsensitiveDupe(arr) {`
`@@ -264,6 +265,8 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp`
`264`	`265`
`265`	`266`	`return hasDupe;`
`266`	`267`	`}`
	`268`	`+=======`
	`269`	`+>>>>>>> 2641bf6... fix(uiSelectSingle): Tagging without multiple with new tags doesn't works`
`267`	`270`
`268`	`271`	`//Copied from uiSelectMultipleDirective`
`269`	`272`	`function _findApproxDupe(haystack, needle) {`