From 4caa694e04b45d722a9823247516e4e436d7128a Mon Sep 17 00:00:00 2001 From: mtrx Date: Sun, 1 Oct 2023 21:54:29 +0200 Subject: [PATCH] Update src/game/player.tscn --- src/game/player.tscn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/game/player.tscn b/src/game/player.tscn index 5586ba2..f4c7e26 100644 --- a/src/game/player.tscn +++ b/src/game/player.tscn @@ -1,8 +1,4 @@ -<<<<<<< HEAD -[gd_scene load_steps=6 format=3 uid="uid://ckau5s2tsb3oc"] -======= [gd_scene load_steps=8 format=3 uid="uid://ckau5s2tsb3oc"] ->>>>>>> 687604fc054965ceb81bf5299befc599e0bb90ed [ext_resource type="Script" path="res://src/game/player_controller.gd" id="1_g4ij8"] [ext_resource type="Texture2D" uid="uid://bx4nammvn7hea" path="res://assets/vehicle2.png" id="2_ifw0w"]