Author: lindner
Date: Tue Jun 23 22:44:06 2009
New Revision: 787863
URL: http://svn.apache.org/viewvc?rev=787863&view=rev
Log:
fix bad merge/patch
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/features.txt?rev=787863&r1=787862&r2=787863&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/features.txt
(original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/features.txt
Tue Jun 23 22:44:06 2009
@@ -25,7 +25,7 @@
features/core/feature.xml
features/dynamic-height/feature.xml
features/flash/feature.xml
-+features/i18n/feature.xml
+features/i18n/feature.xml
features/locked-domain/feature.xml
features/minimessage/feature.xml
features/oauthpopup/feature.xml
