From 42ae90cd1e0245645208b9f54b75097a91295bbe Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 5 Feb 2011 20:55:16 +0000 Subject: Missed language string from last commit. git-svn-id: http://code.elgg.org/elgg/trunk@8035 36083f99-b078-4883-b0ff-0f9b5a30f544 --- languages/en.php | 1 + 1 file changed, 1 insertion(+) (limited to 'languages') diff --git a/languages/en.php b/languages/en.php index 406679d58..db0811b60 100644 --- a/languages/en.php +++ b/languages/en.php @@ -86,6 +86,7 @@ $english = array( 'ElggPlugin:Dependencies:Requires' => 'Requires', 'ElggPlugin:Dependencies:Conflicts' => 'Conflicts', + 'ElggPlugin:Dependencies:Conflicted' => 'Conflicted', 'ElggPlugin:Dependencies:Provides' => 'Provides', 'ElggPlugin:Dependencies:Priority' => 'Priority', -- cgit v1.2.3