fixed popup_dialog.vue no longer existing

app/assets/javascripts/boards/components/board_form.vue

@@ -2,7 +2,7 @@
 /* global BoardService */
 
 import Flash from '~/flash';
-import PopupDialog from '~/vue_shared/components/popup_dialog.vue';
+import modal from '../../vue_shared/components/modal.vue';
 import { visitUrl } from '../../lib/utils/url_utility';
 import BoardMilestoneSelect from './milestone_select.vue';
 import BoardWeightSelect from './weight_select.vue';
@@ -74,7 +74,7 @@ export default {
     BoardLabelsSelect,
     BoardMilestoneSelect,
     BoardWeightSelect,
-    PopupDialog,
+    modal,
   },
   computed: {
     isNewForm() {
@@ -179,7 +179,7 @@ export default {
 </script>
 
 <template>
-  <popup-dialog
+  <modal
     v-show="currentPage"
     modal-dialog-class="board-config-modal"
     :hide-footer="readonly"
@@ -275,5 +275,5 @@ export default {
         </div>
       </form>
     </template>
-  </popup-dialog>
+  </modal>
 </template>

app/assets/javascripts/dispatcher.js

@@ -98,15 +98,12 @@ import ProjectLabelSubscription from './project_label_subscription';
 import ProjectVariables from './project_variables';
 import SearchAutocomplete from './search_autocomplete';
 import Activities from './activities';
-<<<<<<< HEAD
 
 // EE-only
 import ApproversSelect from './approvers_select';
 import AuditLogs from './audit_logs';
 import initGeoInfoModal from './init_geo_info_modal';
 import initGroupAnalytics from './init_group_analytics';
-=======
->>>>>>> upstream/master
 
 (function() {
   var Dispatcher;
@@ -413,10 +410,6 @@ import initGroupAnalytics from './init_group_analytics';
           if ($('#tree-slider').length) new TreeView();
           if ($('.blob-viewer').length) new BlobViewer();
           if ($('.project-show-activity').length) new Activities();
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
           $('#tree-slider').waitForImages(function() {
             ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
           });