From 5179cc6de9bf846d72d90422861e489f62cdc460 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlWpgZ9OO_hYzDHNsVTDD-RvwTk5tsZWNA"
 <CTIT@web>
Date: Wed, 4 Jan 2012 05:10:26 -0800
Subject: [PATCH 1/1]

---
 AFSLore/AddOnsToolsAndUtilities.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AFSLore/AddOnsToolsAndUtilities.mdwn b/AFSLore/AddOnsToolsAndUtilities.mdwn
index 6f2771a..e591b71 100644
--- a/AFSLore/AddOnsToolsAndUtilities.mdwn
+++ b/AFSLore/AddOnsToolsAndUtilities.mdwn
@@ -6,7 +6,6 @@
         <li><a href="http://truongtan.tumblr.com"> truong tan</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,7 +15,9 @@
         <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="http://quatet.vipecom.vn/san-pham/gio-qua-tet/n">Gio qua tet</a></li>
         <li><a href="#Pam-KRB5"> Pam-KRB5</a></li>
         <li><a href="#Partinfo"> Partinfo</a></li>
         <li><a href="#PHPafsfree">PHPafsfree</a></li>
@@ -34,6 +35,5 @@
        <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
 =======
        
-- 
1.9.4