Kickstart restore to default

alextrical · Dec 22, 2023 · 850bd62 · 850bd62
1 parent b5c5b1f
commit 850bd62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 43 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -4,9 +4,9 @@ rules:                           # Array of rules
     upstream: ublue-os:template  # Required. Must be in the same fork network.
     mergeMethod: hardreset       # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
     mergeUnstable: false
-  - base: live
-    upstream: template
-    mergeMethod: merge
+  - base: live                   # Required. Target branch
+    upstream: template           # Required. Must be in the same fork network.
+    mergeMethod: merge           # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
     mergeUnstable: false
 label: ":arrow_heading_down: pull"
-conflictLabel: "merge-conflict"
+conflictLabel: "merge-conflict"
diff --git a/boot_menu.yml b/boot_menu.yml
@@ -1,5 +1,5 @@
 ublue_variants:
   - label: alextrical/makerspace-kinoite
-    ks: /kickstart/makerspace-kinoite.ks
+    ks: /kickstart/ublue-os.ks
     flavors:
       - label: makerspace-kinoite
diff --git a/kickstart/makerspace-kinoite.ks b/kickstart/makerspace-kinoite.ks