Merge pull request #155 from mothmapper/protobox #500
Annotations
11 errors and 1 warning
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Fore Central Primary Hallway (75,145,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Library (84,141,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (85,126,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (85,125,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (86,141,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (86,140,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Hydroponics (86,139,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (86,125,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (87,141,2)! Please manually address all potential merge conflicts!!!
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (87,126,2)! Please manually address all potential merge conflicts!!!
|
|
This job was cancelled
Loading