Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Charcoal-SE/SmokeDetector
Browse files Browse the repository at this point in the history
  • Loading branch information
@SmokeDetector
SmokeDetector committed May 29, 2019
2 parents 1fb0568 + 377b065 commit cc2407e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion watched_keywords.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10288,7 +10288,6 @@
1559065608 Byte Commander gold4cash
1559066727 Makyen (?-i:JR49xBTrO21CE1TdmfApFg)
1559066747 Makyen gilipollas(?#asshole)
1559067649 Byte Commander 4cashpath\.com
1558978155 double-beep isemc\.com
1559056610 double-beep CRYTOMAXHACKER(?:@GMAIL\.COM)?
1559057246 double-beep cybergods116(?:@gmail\.com)?
Expand Down

1 comment on commit cc2407e

@teward
Copy link
Member

@teward teward commented on cc2407e May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was due to me fixing CI and then there being as a result merge conflicts and Master being out of sync with GH Master. Had to get this 'manual merge' into play. Hate it when git doesn't behave right but, it never actually removed the watch with the earlier PR so everything else conflicted.

Please sign in to comment.