From 6ca59e9bbf428466c61c78a301e57301892a8043 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlmk3J0kAobeCs-srAr3pLtLfkM-pxGaLA"
 <trng_nht@web>
Date: Tue, 3 Jan 2012 20:05:46 -0800
Subject: [PATCH]

---
 AFSLore/AddOnsToolsAndUtilities.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/AFSLore/AddOnsToolsAndUtilities.mdwn b/AFSLore/AddOnsToolsAndUtilities.mdwn
index 4d0a6b1..6f2771a 100644
--- a/AFSLore/AddOnsToolsAndUtilities.mdwn
+++ b/AFSLore/AddOnsToolsAndUtilities.mdwn
@@ -5,7 +5,7 @@
 <<<<<<< HEAD
         <li><a href="http://truongtan.tumblr.com"> truong tan</a></li>
 =======
-        <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>
@@ -30,6 +30,10 @@
         <li><a href="#Kvibille Nautilus Plugin"> Kvibille Nautilus Plugin</a></li>
         <li><a href="#Nautilus for RHEL4"> Nautilus for RHEL4</a></li>
 <<<<<<< 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
+=======
        
-- 
1.9.4