From 6fe6cfd68efbcba08a2b37b3a5947d6e70c9cfba Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 29 Sep 2017 23:42:35 -0500 Subject: [PATCH] Update ipintel.dm --- code/modules/admin/ipintel.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index d048b71170..fa9951f276 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -78,11 +78,7 @@ if (!SSipintel.enabled) return -<<<<<<< HEAD - var/list/http[] = world.Export("http://[config.ipintel_domain]/check.php?ip=[ip]&contact=[config.ipintel_email]&format=json&flags_1=f") -======= var/list/http[] = world.Export("http://[CONFIG_GET(string/ipintel_domain)]/check.php?ip=[ip]&contact=[CONFIG_GET(string/ipintel_email)]&format=json&flags=f") ->>>>>>> 4178c20... Configuration datum refactor (#30763) if (http) var/status = text2num(http["STATUS"])