diff options
Diffstat (limited to 'client/scripts')
| -rw-r--r-- | client/scripts/map.gd | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/client/scripts/map.gd b/client/scripts/map.gd index abbd4c92..b5e519a6 100644 --- a/client/scripts/map.gd +++ b/client/scripts/map.gd @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= # Undercooked - a game about cooking # Copyright 2024 nokoe # Copyright 2024 tpart @@ -18,7 +16,6 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. # @tool ->>>>>>> c974879 ([skip-notice] Insert license notice EVERYWHERE!!) class_name Map extends Node3D |