solved conflicts

This commit is contained in:
Matt K. Fu committed 2013-04-01 17:18:41 +08:00
1 parent bd3e9fe4f6
commit 3476237fa7
28 files changed
+316 -265

No files matched your search

@@ -1 +1 @@
<%= f.select :module_app_id, @apps.collect { |t| [t.module_name, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>
<%= f.select :module_app_id, @module_apps.collect { |t| [t.module_name, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>