Resolve conflict

[rails.git] / lib / editors.rb

diff --git a/lib/editors.rb b/lib/editors.rb
index ed1de5999d161baf6ab938ab2e12b17cdb28148e..101a6f80c457e251e04558dd95d28cf58e3e9643 100644 (file)
--- a/lib/editors.rb
+++ b/lib/editors.rb
@@ -1,3 +1,4 @@
 module Editors 
-  ALL_EDITORS = [ "potlatch", "potlatch2", "remote" ]
+  ALL_EDITORS = [ "potlatch", "potlatch2", "id", "remote" ]
+  RECOMMENDED_EDITORS = [ "id", "potlatch2", "remote" ]
 end