Conflict resolved after rebase

2025-08-21 23:23:51 +00:00 · 2021-12-13 19:16:53 +01:00
parent a983b34f0d 550b4775bf
commit 8c14232a91
2 changed files with 6 additions and 12 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -327,6 +327,7 @@ export default {
      AddPersons,
      PersonRenderBox,
      AddressRenderBox,
+      ThirdPartyRenderBox,
      PickTemplate,
      ThirdPartyRenderBox,
      OnTheFly