Files
Bubberstation/tools/mapmerge2/merge_driver.py
SkyratBot 8f61d81b55 [MIRROR] Merge Conflict Markers Proper Variable Addition [MDB IGNORE] (#15047)
* Merge Conflict Markers Proper Variable Addition (#68536)

Hey there,

I fucked up. I used a comma when I should have used a semicolon. I think I did change it back after a test case but I probably forgot to save, skull emoji. Should be all good now.

* Merge Conflict Markers Proper Variable Addition

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Funce <funce.973@gmail.com>
2022-07-23 13:52:16 -04:00

5.2 KiB