# HG changeset patch
# User Alessio Caiazza <nolith@abisso.org>
# Date 1272138245 -7200
# Node ID 00045afc8edc41ac4d12f049f66fe1d0bcda53e5
# Parent  b017b58d9ece2e1f65d35b24be9d25cd52a5241c
FIX conflict with find-me-on reported by davethedrummer

diff -r b017b58d9ece2e1f65d35b24be9d25cd52a5241c -r 00045afc8edc41ac4d12f049f66fe1d0bcda53e5 aboutme.php
--- a/aboutme.php	Thu Oct 29 09:50:48 2009 +0100
+++ b/aboutme.php	Sat Apr 24 21:44:05 2010 +0200
@@ -407,7 +407,7 @@
 
    if (isset($_POST['saveorder']))
    {
-      saveSortOrder();
+      about_me_saveSortOrder();
    }
 
 
@@ -482,7 +482,7 @@
 
 }//End of widget_social_links_settings
 
-function saveSortOrder(){
+function about_me_saveSortOrder(){
    global $wpdb;
    global $message;
    global $messageClass;