From 8a69c8f4fc64fe556869312c5d58f9f12f3bed9f Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryan@rypac.org>
Date: Mon, 12 Aug 2024 21:43:36 +1000
Subject: [PATCH] Ensure Sublime config is valid JSON

---
 sublime-merge/Commit.sublime-menu         | 8 ++++----
 sublime-merge/Default.sublime-commands    | 6 +++---
 sublime-merge/Diff Context.sublime-menu   | 2 +-
 sublime-text/Default.sublime-commands     | 2 +-
 sublime-text/Preferences.sublime-settings | 7 +++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/sublime-merge/Commit.sublime-menu b/sublime-merge/Commit.sublime-menu
index 9d71551..0110130 100644
--- a/sublime-merge/Commit.sublime-menu
+++ b/sublime-merge/Commit.sublime-menu
@@ -5,12 +5,12 @@
         "command": "show_command_palette",
         "args": {
             "command": "git",
-            "args": {"argv": ["rebase", "$commit~1", "--onto", "$select_branch"]},
-        },
+            "args": {"argv": ["rebase", "$commit~1", "--onto", "$select_branch"]}
+        }
     },
     {
         "caption": "Start Interactive Rebase…",
         "command": "git",
-        "args": {"argv": ["rebase", "-i", "$commit~1"]},
-    },
+        "args": {"argv": ["rebase", "-i", "$commit~1"]}
+    }
 ]
diff --git a/sublime-merge/Default.sublime-commands b/sublime-merge/Default.sublime-commands
index 2fb9ba3..1f8d94a 100644
--- a/sublime-merge/Default.sublime-commands
+++ b/sublime-merge/Default.sublime-commands
@@ -10,8 +10,8 @@
         "args": { "argv": ["branch-clean"] }
     },
     {
-        "caption": "Rebase onto… ",
+        "caption": "Rebase onto…",
         "command": "git",
-        "args": {"argv": ["rebase", "$select_branch", "--onto", "$select_branch"]},
-    },
+        "args": {"argv": ["rebase", "$select_branch", "--onto", "$select_branch"]}
+    }
 ]
diff --git a/sublime-merge/Diff Context.sublime-menu b/sublime-merge/Diff Context.sublime-menu
index c0a042c..0a82a12 100644
--- a/sublime-merge/Diff Context.sublime-menu	
+++ b/sublime-merge/Diff Context.sublime-menu	
@@ -7,5 +7,5 @@
     {
         "caption": "Blame",
         "command": "blame", "args": { "path": "$path" }
-    },
+    }
 ]
diff --git a/sublime-text/Default.sublime-commands b/sublime-text/Default.sublime-commands
index 03d59f0..7910417 100644
--- a/sublime-text/Default.sublime-commands
+++ b/sublime-text/Default.sublime-commands
@@ -88,5 +88,5 @@
     {
         "command": "switch_to_previous_window",
         "caption": "Switch: To Previous Window"
-    },
+    }
 ]
diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings
index 6da2a35..ac747bf 100644
--- a/sublime-text/Preferences.sublime-settings
+++ b/sublime-text/Preferences.sublime-settings
@@ -4,11 +4,10 @@
     "highlight_modified_tabs": true,
     "translate_tabs_to_spaces": true,
     "trim_trailing_white_space_on_save": "all",
-    "ignored_packages":
-    [
+    "ignored_packages": [
         "NeoVintageous",
         "Six",
         "Vintage",
-        "Vintageous",
-    ],
+        "Vintageous"
+    ]
 }