Merge branch 'XAMPPRocky:master' into bitbake_conf_fix

XAMPPRocky · Dec 9, 2023 · 8acab3d · 8acab3d
2 parents 821939d + e2625c0
commit 8acab3d
Show file tree

Hide file tree

Showing 8 changed files with 526 additions and 427 deletions.
diff --git a/.github/workflows/mean_bean_ci.yml b/.github/workflows/mean_bean_ci.yml
@@ -155,7 +155,7 @@ jobs:
           # by default.
           # - i686-unknown-freebsd
           # - x86_64-unknown-freebsd
-          - x86_64-unknown-netbsd
+          # - x86_64-unknown-netbsd
           # Solaris
           # - sparcv9-sun-solaris
           # - x86_64-sun-solaris

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,7 +14,6 @@ properties of a language in `languages.json` through examples.
 "JavaScript": {
       "line_comment": ["//"],
       "multi_line_comments": [["/*", "*/"]],
-      "quotes": [["\\\"", "\\\""]],
       "quotes": [["\\\"", "\\\""], ["'", "'"], ["`", "`"]],
       "extensions": ["js", "mjs"]
 },