diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 22:04:37 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 22:04:37 +0300 |
| commit | b22e90b794fc740f8cec33f115fe1be3d1dea5ba (patch) | |
| tree | 9270909b57feb834acf00523782bd8140d9cd34f /app | |
| parent | 2a6e52f2189f26b13b98cc431b26d1d353697bd4 (diff) | |
| download | gitlab-ce-b22e90b794fc740f8cec33f115fe1be3d1dea5ba.tar.gz | |
Fix bad merge conflict resolution.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f39eb40f0f2..8d99b12102d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -61,7 +61,6 @@ new IssuableForm($('.issue-form')); new LabelsSelect(); new MilestoneSelect(); - new IssuableTemplateSelectors(); new gl.IssuableTemplateSelectors(); break; case 'projects:merge_requests:new': @@ -72,7 +71,6 @@ new IssuableForm($('.merge-request-form')); new LabelsSelect(); new MilestoneSelect(); - new IssuableTemplateSelectors(); new gl.IssuableTemplateSelectors(); break; case 'projects:tags:new': |