scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Anton 2024-02-26 10:47:47 +01:00
parent d72e63a0f2
commit b0504bc2a0
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/views/reports/index.html.erb
View file

@ -46,18 +46,3 @@
</div>
<% end %>
</div>
<<<<<<< HEAD
<div id="actionToolbar" data-behaviour="vue">
<action-toolbar actions-url="<%= actions_toolbar_reports_url %>" />
</div>
<%= render partial: 'reports/modals/regenerate' %>
<%= javascript_include_tag "vue_components_action_toolbar" %>
<%= javascript_include_tag 'reports/save_pdf_to_inventory' %>
<%= javascript_include_tag 'reports/reports_datatable' %>
<%= javascript_include_tag 'pdf_js' %>
<%= stylesheet_link_tag 'pdf_js_styles' %>
=======
>>>>>>> develop