Resolve conflicts in...

Resolve conflicts in app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

Resolve conflicts in...
Resolve conflicts in app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
77568dc8 · Stan Hu · 3260863d · 77568dc8
Commit 77568dc8 authored Oct 06, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue ...projects/shared/permissions/components/settings_panel.vue +5 -4

No files found.
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -57,9 +57,6 @@
        required: false,
        default: '',
      },
-<<<<<<< HEAD
-      packagesHelpPath: {
-=======
      pagesAvailable: {
        type: Boolean,
        required: false,
@@ -71,7 +68,11 @@
        default: false,
      },
      pagesHelpPath: {
->>>>>>> upstream/master
+        type: String,
+        required: false,
+        default: '',
+      },
+      packagesHelpPath: {
        type: String,
        required: false,
        default: '',