fixed the previous commit for the conflict

diff --git a/languages/en.php b/languages/en.php
index 7649bcbc35a8a6723d4984d541b1b54d521e1ad7..e7806be27de6b9cb53a74863b6870522f61edf59 100644 (file)
--- 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',