From 5e02fd697fd15ae857aa0c2969fd9ea92043a55a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 24 Jun 2011 07:21:33 -0400
Subject: fixed the previous commit for the conflict

---
 languages/en.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 7649bcbc3..e7806be27 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -403,8 +403,7 @@ $english = array(
  * River
  */
 	'river' => "River",
-	'river:relationship:friend' => 'is now friends with',
-	'friends:river:add' => "is now a friend with %s",
+	'river:friend:user:default' => "%s is now a friend with %s",
 	'profile:river:iconupdate' => 'updated their profile icon',
 	'river:noaccess' => 'You do not have permission to view this item.',
 	'river:posted:generic' => '%s posted',
-- 
cgit v1.2.3