Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 9eda0f6

Browse files
committed
Auto stash before merge of "regex" and "origin/regex"
1 parent dd9f639 commit 9eda0f6

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

‎public/consolidated/regex.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,40 @@
1212
],
1313
"contributors": [],
1414
"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+
},
18+
{
19+
"title": "IPv4",
20+
"description": "Matches IPv4 address",
21+
"author": "majvax",
22+
"tags": [
23+
"ipv4",
24+
"networking"
25+
],
26+
"contributors": [],
27+
"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"
28+
},
29+
{
30+
"title": "Unintentional Duplication",
31+
"description": "Matches duplicated word in a text.",
32+
"author": "majvax",
33+
"tags": [
34+
"trim"
35+
],
36+
"contributors": [],
37+
"code": "\\b(\\w+)\\s+\\1\\b\n\n\n-> Usage:\nI need to finish this task ✗\nI need to to finish this task ✓\n"
38+
},
39+
{
40+
"title": "Whitespace Trimmer",
41+
"description": "Matches leading and/or trailing whitespace.",
42+
"author": "majvax",
43+
"tags": [
44+
"trim"
45+
],
46+
"contributors": [],
47+
"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
1549
}
1650
]
1751
},

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /