Fixes linter and conflict shit

This commit is contained in:
Artur
2020-07-13 16:35:12 +03:00
parent 5f9364c5f8
commit 732a1ca438
2 changed files with 1 additions and 2 deletions
@@ -62072,7 +62072,6 @@
departmentType = 2;
name = "Chemistry RC";
pixel_x = 30;
pixel_y = 0;
receive_ore_updates = 1
},
/turf/open/floor/plasteel/white,