Merge branch 'master' of https://github.com/angular-ui/ui-select2

* 'master' of https://github.com/angular-ui/ui-select2:
  chore(tests): Setting up test env

Conflicts:
	src/ui-select2.js
	tests/test.conf.js

Author: Dean Sofer

src/ui-select2.js

@@ -5,7 +5,11 @@
  *     This change is so that you do not have to do an additional query yourself on top of Select2's own query
  * @params [options] {object} The configuration options passed to $.fn.select2(). Refer to the documentation
  */
+<<<<<<< HEAD:src/ui-select2.js
 angular.module('ui.select2', []).directive('uiSelect2', ['uiSelect2Config', '$timeout', function (uiSelect2Config, $timeout) {
+=======
+angular.module('ui.select2', []).directive('uiSelect2', ['ui.config', '$timeout', function (uiConfig, $timeout) {
+>>>>>>> 92733e3ba9527423adc5e7433cd6918590f04e65:select2.js
   var options = {};
   if (uiSelect2Config) {
     angular.extend(options, uiSelect2Config);

tests/test.conf.js

@@ -2,11 +2,18 @@ basePath = '..';
 files = [
   JASMINE,
   JASMINE_ADAPTER,
+<<<<<<< HEAD
   'components/jquery/jquery.js',
   'components/angular/angular.js',
   'components/angular-mocks/angular-mocks.js',
   'components/select2/select2.js',
   'src/*.js',
   'tests/*.js'
+=======
+  'libs/angular.js/angular.js',
+  'libs/select2/select2.js',
+  'tests/*.js',
+  '*.js'
+>>>>>>> 92733e3ba9527423adc5e7433cd6918590f04e65
 ];
 runOnce = true;