projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dfe909d) | patch
Bug 33648: (bug 32991 follow-up) fix bad resolution conflict
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 3 May 2023 06:46:58 +0000 (08:46 +0200)
committerMartin Renvoize <martin.renvoize@ptfs-europe.com>
Wed, 3 May 2023 11:38:12 +0000 (12:38 +0100)
commitcf32ea4d84c8b18bacccaf05c7201f917c26d6bd
treeea67720cd0923e26d26017b42f54e76c60262beetree | snapshot
parentdfe909d252c16674ba8d40cb3241eeacb4d4bd71commit | diff
Bug 33648: (bug 32991 follow-up) fix bad resolution conflict

Wrong resolution conflict on AgreementsList.vue in commit
  Bug 32991: Improve our Dialog component

in master
             logged_in_user,
+            setWarning,
+            setMessage,

in 22.11.x

+            logged_in_user,
+            setWarning,
+            setMessage,

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue diff | blob | history
Main Koha release repository