1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 16879e0..9b6d8a9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:ChangeLog.txt
 2009-01-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llcommon/llversionviewer.h
@@ -75,6 +76,13 @@
         * linden/indra/newview/llviewermenu.cpp:
         Added 'create landmark' to land pie menu.
         * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml:
+=======
+2009-01-10  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llviewermenu.cpp:
+        Backported 'report abuse' avatar pie menu option.
+        * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml:
+>>>>>>> pieavreportabuse:ChangeLog.txt
         Ditto.