From 6ed55be62cadcb3e7ef172355dc20180088b2545 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Wed, 17 May 2023 11:40:14 +0200
Subject: [PATCH] Fix merge conflicts

---
 app/javascript/vue/protocol/container.vue          | 2 +-
 app/javascript/vue/protocol/step_elements/text.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue
index 41e9a8ed1..f98c61746 100644
--- a/app/javascript/vue/protocol/container.vue
+++ b/app/javascript/vue/protocol/container.vue
@@ -77,7 +77,7 @@
                 :fieldName="'protocol[description]'"
                 :lastUpdated="protocol.attributes.updated_at"
                 :assignableMyModuleId="protocol.attributes.assignable_my_module_id"
-                :characterLimit="100000"
+                :characterLimit="1000000"
                 @update="updateDescription"
               />
             </div>
diff --git a/app/javascript/vue/protocol/step_elements/text.vue b/app/javascript/vue/protocol/step_elements/text.vue
index 9af11d9a6..396d11699 100644
--- a/app/javascript/vue/protocol/step_elements/text.vue
+++ b/app/javascript/vue/protocol/step_elements/text.vue
@@ -27,7 +27,7 @@
       :fieldName="'step_text[text]'"
       :lastUpdated="element.attributes.orderable.updated_at"
       :assignableMyModuleId="assignableMyModuleId"
-      :characterLimit="100000"
+      :characterLimit="1000000"
       @update="update"
       @editingDisabled="disableEditMode"
       @editingEnabled="enableEditMode"