Revert "Aggiornamento a 0.6.1"

This reverts commit 701e1f1968.
2023-04-07 18:38:22 +02:00
parent 799a8a0e15
commit eb4998dcd2
13 changed files with 337 additions and 1 deletions
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -1104,6 +1104,15 @@
      >
      </CMyCardCircuitPopup>
      <CMyCardService v-else-if="mytable === 'myskills'"
+<<<<<<< HEAD
+=======
+        :table="mytable" :prop_myrec="myrecdialog">
+      </CMyCardService>
+      <CMyCardService v-else-if="mytable === 'mygoods'"
+        :table="mytable" :prop_myrec="myrecdialog">
+      </CMyCardService>
+      <CMyCardService v-else-if="mytable === 'myhosps'"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
        :table="mytable" :prop_myrec="myrecdialog">
      </CMyCardService>
      <CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">