From 79bad418435a9b44322126a929a00c386e0d1fbc Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Wed, 10 Jan 2018 12:00:28 +0100 Subject: [PATCH] fix: Remove conflict file #10289 --- public/app/core/angular_wrappers.ts.orig | 36 ------------------------ 1 file changed, 36 deletions(-) delete mode 100644 public/app/core/angular_wrappers.ts.orig diff --git a/public/app/core/angular_wrappers.ts.orig b/public/app/core/angular_wrappers.ts.orig deleted file mode 100644 index 0ae4d981805..00000000000 --- a/public/app/core/angular_wrappers.ts.orig +++ /dev/null @@ -1,36 +0,0 @@ -<<<<<<< HEAD -import { react2AngularDirective } from "app/core/utils/react2angular"; -import { PasswordStrength } from "./components/PasswordStrength"; -import PageHeader from "./components/PageHeader/PageHeader"; -import EmptyListCTA from "./components/EmptyListCTA/EmptyListCTA"; -import LoginBackground from "./components/Login/LoginBackground"; -import { SearchResult } from "./components/search/SearchResult"; -import UserPicker from "./components/UserPicker/UserPicker"; - -export function registerAngularDirectives() { - react2AngularDirective("passwordStrength", PasswordStrength, ["password"]); - react2AngularDirective("pageHeader", PageHeader, ["model", "noTabs"]); - react2AngularDirective("emptyListCta", EmptyListCTA, ["model"]); - react2AngularDirective("loginBackground", LoginBackground, []); - react2AngularDirective("searchResult", SearchResult, []); - react2AngularDirective("userPickerr", UserPicker, [ - "backendSrv", - "teamId", - "refreshList" - ]); -======= -import { react2AngularDirective } from 'app/core/utils/react2angular'; -import { PasswordStrength } from './components/PasswordStrength'; -import PageHeader from './components/PageHeader/PageHeader'; -import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA'; -import LoginBackground from './components/Login/LoginBackground'; -import UserPicker from './components/UserPicker/UserPicker'; - -export function registerAngularDirectives() { - react2AngularDirective('passwordStrength', PasswordStrength, ['password']); - react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']); - react2AngularDirective('emptyListCta', EmptyListCTA, ['model']); - react2AngularDirective('loginBackground', LoginBackground, []); - react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'teamId', 'refreshList']); ->>>>>>> fix: Rename directive user-pickerr (yes two r's) to select-user-picker -}