resolve conflict

ynput · Nov 24, 2023 · 182287c · 182287c
2 parents cabfa45 + 83e5319
commit 182287c
Show file tree

Hide file tree

Showing 648 changed files with 46,270 additions and 5,835 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,31 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.17.7-nightly.2
+        - 3.17.7-nightly.1
+        - 3.17.6
+        - 3.17.6-nightly.3
+        - 3.17.6-nightly.2
+        - 3.17.6-nightly.1
+        - 3.17.5
+        - 3.17.5-nightly.3
+        - 3.17.5-nightly.2
+        - 3.17.5-nightly.1
+        - 3.17.4
+        - 3.17.4-nightly.2
+        - 3.17.4-nightly.1
+        - 3.17.3
+        - 3.17.3-nightly.2
+        - 3.17.3-nightly.1
+        - 3.17.2
+        - 3.17.2-nightly.4
+        - 3.17.2-nightly.3
+        - 3.17.2-nightly.2
+        - 3.17.2-nightly.1
+        - 3.17.1
+        - 3.17.1-nightly.3
+        - 3.17.1-nightly.2
+        - 3.17.1-nightly.1
         - 3.17.0
         - 3.16.7
         - 3.16.7-nightly.2
@@ -110,31 +135,6 @@ body:
         - 3.15.2-nightly.5
         - 3.15.2-nightly.4
         - 3.15.2-nightly.3
-        - 3.15.2-nightly.2
-        - 3.15.2-nightly.1
-        - 3.15.1
-        - 3.15.1-nightly.6
-        - 3.15.1-nightly.5
-        - 3.15.1-nightly.4
-        - 3.15.1-nightly.3
-        - 3.15.1-nightly.2
-        - 3.15.1-nightly.1
-        - 3.15.0
-        - 3.15.0-nightly.1
-        - 3.14.11-nightly.4
-        - 3.14.11-nightly.3
-        - 3.14.11-nightly.2
-        - 3.14.11-nightly.1
-        - 3.14.10
-        - 3.14.10-nightly.9
-        - 3.14.10-nightly.8
-        - 3.14.10-nightly.7
-        - 3.14.10-nightly.6
-        - 3.14.10-nightly.5
-        - 3.14.10-nightly.4
-        - 3.14.10-nightly.3
-        - 3.14.10-nightly.2
-        - 3.14.10-nightly.1
     validations:
       required: true
   - type: dropdown