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

majvax · majvax · commit 8fdc7dbdabf3 · 2025-01-04T15:56:04.000+01:00
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
             }
         ]
     },

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`	`],`
`13`	`13`	`"contributors": [],`
`14`	`14`	`"code": "^#([a-fA-F0-9]{6}\|[a-fA-F0-9]{3})$\n\n\n-> Usage:\n#FFF1 ✗\n#FFF ✓\n#FFF000 ✓\n"`
`15`		`-<<<<<<< Updated upstream`
`16`		`-=======`
`17`	`15`	`},`
`18`	`16`	`{`
`19`	`17`	`"title": "IPv4",`
`@@ -45,7 +43,6 @@`
`45`	`43`	`],`
`46`	`44`	`"contributors": [],`
`47`	`45`	`"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"`
`48`		`->>>>>>> Stashed changes`
`49`	`46`	`}`
`50`	`47`	`]`
`51`	`48`	`},`