Auto stash before merge of "regex" and "origin/regex"

Author: majvax

public/consolidated/regex.json

@@ -12,6 +12,40 @@
                 ],
                 "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",
+                "description": "Matches IPv4 address",
+                "author": "majvax",
+                "tags": [
+                    "ipv4",
+                    "networking"
+                ],
+                "contributors": [],
+                "code": "^((25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})$\n\n\n-> Usage:\n123.300.0.101 ✗\n127.0.0.1 ✓\n192.168.0.1 ✓\n"
+            },
+            {
+                "title": "Unintentional Duplication",
+                "description": "Matches duplicated word in a text.",
+                "author": "majvax",
+                "tags": [
+                    "trim"
+                ],
+                "contributors": [],
+                "code": "\\b(\\w+)\\s+\\1\\b\n\n\n-> Usage:\nI need to finish this task ✗\nI need to to finish this task ✓\n"
+            },
+            {
+                "title": "Whitespace Trimmer",
+                "description": "Matches leading and/or trailing whitespace.",
+                "author": "majvax",
+                "tags": [
+                    "trim"
+                ],
+                "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
             }
         ]
     },