From 5aa01716efc4ca9d5e30d0e74573e9901f8836a0 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 7 Aug 2023 14:07:38 +0200
Subject: [PATCH] Fix bundling for deleted files

---
 app/assets/stylesheets/application.sass.scss |  2 --
 app/controllers/result_texts_controller.rb   | 10 ----------
 bin/build-css                                |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
index 6e571f3f3..1dfbd6b3b 100644
--- a/app/assets/stylesheets/application.sass.scss
+++ b/app/assets/stylesheets/application.sass.scss
@@ -43,7 +43,6 @@
 @import "dashboard/recent_work";
 @import "dashboard/show";
 @import "repository/assign_items_to_task_modal";
-@import "repository/bmt_filters";
 @import "repository/filters";
 @import "repository/index";
 @import "repository/print_progress_modal";
@@ -76,7 +75,6 @@
 @import "shared/action_toolbar";
 @import "shared/assets";
 @import "shared/avatar";
-@import "shared/breadcrumbs";
 @import "shared/cards";
 @import "shared/comments_sidebar";
 @import "shared/comments";
diff --git a/app/controllers/result_texts_controller.rb b/app/controllers/result_texts_controller.rb
index 9e9093ca7..d2b39b8e5 100644
--- a/app/controllers/result_texts_controller.rb
+++ b/app/controllers/result_texts_controller.rb
@@ -20,19 +20,9 @@ class ResultTextsController < ApplicationController
     )
     @result.build_result_text
 
-<<<<<<< HEAD
-    respond_to do |format|
-      format.json {
-        render json: {
-          html: render_to_string({ partial: 'new', formats: :html })
-        }, status: :ok
-      }
-    end
-=======
     render json: {
       html: render_to_string({ partial: 'new', formats: :html })
     }, status: :ok
->>>>>>> develop
   end
 
   def create
diff --git a/bin/build-css b/bin/build-css
index bbe16ef9d..59e4771d2 100755
--- a/bin/build-css
+++ b/bin/build-css
@@ -2,7 +2,7 @@
 
 ./node_modules/sass/sass.js \
   ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css \
-  ./vendor/assets/stylesheets/handsontable.sass.scss:./app/assets/builds/handsontable.css \
+  ./vendor/assets/stylesheets/handsontable.full.sass.scss:./app/assets/builds/handsontable.css \
   ./vendor/assets/stylesheets/handsontable.formula.sass.scss:./app/assets/builds/handsontable.formula.css \
   ./app/assets/stylesheets/layouts/print_protocol.sass.scss:./app/assets/builds/print_protocol.css \
   ./vendor/assets/stylesheets/datatables.sass.scss:./app/assets/builds/datatables.css \