(no commit message)

[openafs-wiki.git] / IPAccessControl.mdwn

diff --git a/IPAccessControl.mdwn b/IPAccessControl.mdwn
index 2ad0dc4..69bcde6 100644 (file)
--- a/IPAccessControl.mdwn
+++ b/IPAccessControl.mdwn
@@ -2,8 +2,13 @@
 
 ## <a name="Social Media Likes"></a> Chaeplikes.co.uk
 
- [sosial media services] (http://cheaplikes.co.uk)
-[buy facebook likes]( http://cheaplikes.co.uk/buy-facebook-likes/) - [buy youtube likes]( http://cheaplikes.co.uk/buy-youtube-likes/) - [buy instagram likes]( http://cheaplikes.co.uk/buy-instagram-likes/) - [buy instagram likes]( http://cheaplikes.co.uk/buy-pinterest-likes
+<<<<<<< HEAD
+ [http://cheaplikes.co.uk] (http://cheaplikes.co.uk)
+=======
+ [sosial media services](http://cheaplikes.co.uk)
+>>>>>>> e05acb440eee55eba4485dd40fdad24570fc93cc
+[buy facebook likes]( http://cheaplikes.co.uk/buy-facebook-likes/) - [buy youtube likes]( http://cheaplikes.co.uk/buy-youtube-likes/) - [buy instagram likes]( http://cheaplikes.co.uk/buy-instagram-likes/) - [buy instagram likes]( http://cheaplikes.co.uk/buy-pinterest-likes/)
+
 All links in this web page should pop up in a single side window, so you won't have to flip back and forth between pages. I've tried to link every command to a relevant page, but other references may only be linked at their first instance.
 ----