https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25078
--- Comment #76 from Victor Grousset/tuxayo <vic...@tuxayo.net> --- I get the following conflict when applying the rest of patches after «- Make sure the different use cases are covered» <<<<<<< HEAD ---- this is the code after applying «DB revs for testing» $VERSION = "21.06.00.100"; ||||||| constructed merge base $VERSION = "21.06.00.004"; --- code in master before the patch that I'm applying ======= $VERSION = "21.06.00.005"; --- code from the patch that I'm applying >>>>>>> Bug 25078: Put db revs into different files to handle them better I should keep 21.06.00.100 right? But I'm confused that «Put db revs into different [...]» changes the version. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
