diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-11 11:21:55 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-11 11:21:55 -0600 |
| commit | cc9003a3a97c385b6573ad9f85188817380bdcb0 (patch) | |
| tree | 7b93933128239d6c1f1cf8ea082adeceba3ced66 | |
| parent | a3d23d49a03c9148651420925a31628b1efbefc1 (diff) | |
| download | gitlab-ce-dispatcher-blame-blob.tar.gz | |
Fix bad conflict mergedispatcher-blame-blob
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index fa4eac021b5..19aa31665cd 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -42,7 +42,6 @@ import AutoWidthDropdownSelect from './issuable/auto_width_dropdown_select'; import UsersSelect from './users_select'; import RefSelectDropdown from './ref_select_dropdown'; import GfmAutoComplete from './gfm_auto_complete'; -import SigninTabsMemoizer from './signin_tabs_memoizer'; import Star from './star'; import TreeView from './tree'; import Wikis from './wikis'; |