git://git.openafs.org / openafs-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (from parent 1: 605a4a3)
(no commit message)
authorhttps://me.yahoo.com/a/MEvNGxw1rsMxJLBRSUvYN1fo8.1aUpFm.7I-#1e5ab <niolas@web>
Tue, 22 Apr 2014 15:16:10 +0000 (08:16 -0700)
committerOpenAFS Wiki <ikiwiki@openafs.org>
Tue, 22 Apr 2014 15:16:10 +0000 (08:16 -0700)
IPAccessControl.mdwn patch | blob | history

diff --git a/IPAccessControl.mdwn b/IPAccessControl.mdwn
index 110ff44..f3448fd 100644 (file)
--- a/IPAccessControl.mdwn
+++ b/IPAccessControl.mdwn
@@ -1,7 +1,5 @@
 ## <a name="IP Address-Based AFS Access Cont"></a> IP Address-Based AFS Access Control for Fun and Profit
 
-
-<<<<<<< HEAD
  Social Media services on cheaplikes.co.uk
 =======
  [http://cheaplikes.co.uk](http://cheaplikes.co.uk)
OpenAFS Wiki Source