Update 05_membership.yml

z-shell · Jan 27, 2022 · 22d0557 · 22d0557
1 parent dc1e52f
commit 22d0557
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/.github/ISSUE_TEMPLATE/05_membership.yml b/.github/ISSUE_TEMPLATE/05_membership.yml
@@ -11,20 +11,7 @@ body:
       placeholder: "@username"
     validations:
       required: true
-
-<<<<<<< HEAD
-  - type: dropdown
-    attributes:
-      label: Property you'd like to moderate
-      options:
-      - General
-      - Annexes
-      - Plugins
-      - Packges
-      - Community
-      - Documentation
-    validations:
-=======
+
   - type: input
     attributes:
       label: Sponsors
@@ -44,7 +31,6 @@ body:
       - Community
       - Documentation
     validations:
->>>>>>> issues
         required: true
 
   - type: textarea