From 4c4fcd68aee6240c29b7f7faf5909cc921a25304 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 5 Jun 2024 16:33:12 +0200 Subject: [PATCH] Fix merge --- app/controllers/assets_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index 6781cdbc7..6a583d933 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -18,11 +18,7 @@ class AssetsController < ApplicationController before_action :load_vars, except: :create_wopi_file before_action :check_read_permission, except: %i(edit destroy duplicate create_wopi_file toggle_view_mode) -<<<<<<< HEAD - before_action :check_manage_permission, only: %i(edit destroy duplicate toggle_view_mode rename) -======= before_action :check_manage_permission, only: %i(edit destroy duplicate rename toggle_view_mode) ->>>>>>> develop def file_preview render json: { html: render_to_string(