(no commit message)

[openafs-wiki.git] / AFSLore / AddOnsToolsAndUtilities.mdwn

diff --git a/AFSLore/AddOnsToolsAndUtilities.mdwn b/AFSLore/AddOnsToolsAndUtilities.mdwn
index 6f2771a..164e1b9 100644 (file)
--- a/AFSLore/AddOnsToolsAndUtilities.mdwn
+++ b/AFSLore/AddOnsToolsAndUtilities.mdwn
@@ -4,9 +4,12 @@
         <li><a href="#AFS Backend"> AFS Backend</a></li>
 <<<<<<< HEAD
         <li><a href="http://truongtan.tumblr.com"> truong tan</a></li>
+        <li><a href="http://www.linhkieniphone.com.vn/san-pham/giai-ma/iphone/gmate-unlock-iphone-4-version-50-501-goi-dien-cho-iphone-4.html">Gmate</a></li>
+        <li><a href="http://www.linhkieniphone.com.vn/">Linh kien iPhone</a></li>
+        <li><a href="http://www.linhkiensamsung.com/san-pham/linh-kien-samsung/man-hinh-samsung/">Man hinh Samsung</a></li>
+
 =======
         
->>>>>>> 087293037bf69ef2d4b5dbc82f9c217c74d18d73
         <li><a href="#BackupAFS">BackupAFS</a></li>
         <li><a href="#Balancing"> Balancing</a></li>
         <li><a href="#Frak"> Frak</a></li>
@@ -16,6 +19,7 @@
         <li><a href="#Nagios Monitoring"> Nagios Monitoring</a></li>
         <li><a href="#Mount Points"> Mount Points</a></li>
         <li><a href="#MVTO"> MVTO</a></li>
+        
         <li><a href="#Pam-AFS-Session"> Pam-AFS-Session</a></li>
         <li><a href="#Pam-KRB5"> Pam-KRB5</a></li>
         <li><a href="#Partinfo"> Partinfo</a></li>
@@ -32,8 +36,5 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
        <li><a title"but cham doc" href="http://dantri.com.vn/c7/s7-548103/rang-e-buot-noi-lo-cua-cac-ba-me-sau-sinh.htm">răng ê buốt</a></li>
-=======
-       <li><a title"rang e buot" href="http://dantri.com.vn/c7/s7-548103/rang-e-buot-noi-lo-cua-cac-ba-me-sau-sinh.htm">răng ê buốt</a></li>
->>>>>>> b15209a52699886763c366b84b4a69d79312fcbc
-=======
+       <li><a href="http://quatet.vipecom.vn/san-pham/gio-qua-tet/">Gio qua tet</a></li>