diff --git a/tools/mapmerge2/requirements.txt b/tools/mapmerge2/requirements.txt index 6aae09e997..894236b44b 100644 --- a/tools/mapmerge2/requirements.txt +++ b/tools/mapmerge2/requirements.txt @@ -1,3 +1,7 @@ pygit2 bidict==0.13.1 -Pillow==9.0.1 \ No newline at end of file +<<<<<<< HEAD +Pillow==9.0.1 +======= +Pillow==9.3.0 +>>>>>>> 4a1b02324f... Merge pull request #14131 from VOREStation/dependabot/pip/tools/mapmerge2/pillow-9.3.0