Merge remote-tracking branch 'origin/regex' into regex

dostonnabotov · Jan 4, 2025 · 8fdc7db · 8fdc7db
2 parents b3ad907 + 4b438ef
commit 8fdc7db
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/public/consolidated/regex.json b/public/consolidated/regex.json
@@ -12,8 +12,6 @@
                 ],
                 "contributors": [],
                 "code": "^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$\n\n\n-> Usage:\n#FFF1 ✗\n#FFF ✓\n#FFF000 ✓\n"
-<<<<<<< Updated upstream
-=======
             },
             {
                 "title": "IPv4",
@@ -45,7 +43,6 @@
                 ],
                 "contributors": [],
                 "code": "^\\s+|\\s+$\n\n\n-> Usage:\n(don't account for the quotation marks, it just to visualize whitespace)\n\"Hello World\" ✗\n\" Hello World\" ✓\n\"Hello World \" ✓\n\" Hello World \" ✓\n"
->>>>>>> Stashed changes
             }
         ]
     },