projects / 42 / ft_printf.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e5fdfd0 5695f2e)
Applying this merge to show the changes in main should have been merged to testing testing
authorLukas Jiriste <ljiriste@student.42prague.com>
Tue, 12 Sep 2023 12:38:11 +0000 (14:38 +0200)
committerLukas Jiriste <ljiriste@student.42prague.com>
Tue, 12 Sep 2023 12:38:11 +0000 (14:38 +0200)
commit3b7649bd842f059983ea30fa7a71656a14cf9ed4
tree051ec9c885b96790aef7d109259a0606df26873ctree | snapshot (zip tar.gz)
parente5fdfd0ac11cba0802cc2e34d545c24d12ae1671commit | diff
parent5695f2e65c0ee7b9e2d25f8794e4acec4ac3e1f9commit | diff
Applying this merge to show the changes in main should have been merged to testing
and not the other way around.
Merging conflicts will also indicate if the changes to master were done poorly.
Unnamed repository; edit this file 'description' to name the repository.