change version information block of globalblacklist.conf

Author: mitchellkrogza

globalblacklist.conf

@@ -20,18 +20,6 @@
 ### - https://github.com/mariusv/nginx-badbot-blocker
 ### - https://github.com/oohnoitz/nginx-blacklist
 
-<<<<<<< HEAD
-=======
-### Last Updated
-### Updated: Thu May  4 08:53:02 UTC 2017
-### Build: v1.0.375
-### End Last Updated
-
-### Generated in
-### 0.0100586414337 seconds
-### End Generated in
-
->>>>>>> 0f6798304fd5cc6f678fbdfd29f80886231bd76f
 ### Tested on: nginx/1.10.0 (Ubuntu 16.04)
 
 ### This list was developed and is in use on a live Nginx server running some very busy web sites.