pre-merge with non-cloudflare repo

2019-03-12 12:59:45 -04:00 · 2019-03-12 12:59:45 -04:00 · 2d89103584
parent e06ec6c0ad
commit 2d89103584
2 changed files with 2 additions and 3 deletions
--- a/split/cloudflare_c.txt
+++ b/split/cloudflare_c.txt
@ -1,5 +1,3 @@
-=======
->>>>>>> 7caccce93f94afd3a78e2c7746872e7913321da5
 c008.cn
 c00a.com
 c0857.com
@ -40417,6 +40415,7 @@ cgiowa.com
 cgiproxy.website
 cgiroadservices.com
 cgirockland.org
+cgisecurity.com
 cg-israel.com
 cgistars.com
 cgiu.org
@ -135494,4 +135493,3 @@ czzhenyan.com
 czzlsts.com
 czzse.com
 czzx22.com
-<<<<<<< HEAD
--- a/split/cloudflare_e.txt
+++ b/split/cloudflare_e.txt
@ -33844,6 +33844,7 @@ enjeweled.com
 enjiao.com
 enjibeck.com
 enjiia.com
+enjincoin.io
 enjin.com
 enjiner.com
 enjing.com