diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb index f73b5eba..e457758f 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb @@ -1,9 +1,8 @@
+<<<<<<< HEAD<%= t("personal_conference.file")%> | +<%= t("personal_conference.file_name")%> | +<%= t("personal_conference.description") %> | +
---|---|---|
+
+ <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %>
+ add
+
+ |
+