projects / 42 / ft_printf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
and not the other way around.
Merging conflicts will also indicate if the changes to master were done poorly.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.