resolve mergeconflicts

Browse Source

...

This commit is contained in:

Milan

2018-09-28 12:20:44 +02:00

parent b19cd45dcf dfaa87cc56

commit 2ad3c3e5f5

8 changed files with 6 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

mods/illuna

Submodule mods/illuna updated: e64b1211cc...77626c2f75

2

mods/mesecons

Submodule mods/mesecons updated: 7b2456177b...93eed228bc

2

mods/pipeworks

Submodule mods/pipeworks updated: f9f436fd7e...cb5530c6c8

2

mods/playereffects

Submodule mods/playereffects updated: f0f6fa4183...535cf87dc7

2

mods/protector

Submodule mods/protector updated: 8097aa4afe...f8297f0520

2

mods/wine

Submodule mods/wine updated: 769f2bb6e8...5ca1bd332b