From c77b5552997081a3d5f6d40b19069ac81a091362 Mon Sep 17 00:00:00 2001
From: 0xicosahedron <btc_icosahedron@protonmail.com>
Date: Sun, 24 Dec 2023 15:41:35 +0530
Subject: [PATCH] fix tests

---
 crates/dojo-lang/src/plugin_test_data/print | 46 ---------------------
 1 file changed, 46 deletions(-)

diff --git a/crates/dojo-lang/src/plugin_test_data/print b/crates/dojo-lang/src/plugin_test_data/print
index 0e47bfd03d..7fb28c7451 100644
--- a/crates/dojo-lang/src/plugin_test_data/print
+++ b/crates/dojo-lang/src/plugin_test_data/print
@@ -52,8 +52,6 @@ struct Position {
     y: felt252
 }
 
-<<<<<<< HEAD
-=======
 #[cfg(test)]
 impl PositionPrintImpl of core::debug::PrintTrait<Position> {
     fn print(self: Position) {
@@ -65,7 +63,6 @@ impl PositionPrintImpl of core::debug::PrintTrait<Position> {
         core::debug::PrintTrait::print(self.y);
     }
 }
->>>>>>> main
 
 #[derive(Print)]
 struct Roles {
@@ -143,46 +140,3 @@ enum Enemy {
     Bot: felt252,
     OtherPlayer: ContractAddress,
 }
-
-impl PositionCopy of core::traits::Copy::<Position>;
-impl PositionDrop of core::traits::Drop::<Position>;
-impl PositionSerde of core::serde::Serde::<Position> {
-    fn serialize(self: @Position, ref output: core::array::Array<felt252>) {
-        core::serde::Serde::serialize(self.id, ref output);
-        core::serde::Serde::serialize(self.x, ref output);
-        core::serde::Serde::serialize(self.y, ref output)
-    }
-    fn deserialize(ref serialized: core::array::Span<felt252>) -> core::option::Option<Position> {
-        core::option::Option::Some(Position {
-            id: core::serde::Serde::deserialize(ref serialized)?,
-            x: core::serde::Serde::deserialize(ref serialized)?,
-            y: core::serde::Serde::deserialize(ref serialized)?,
-        })
-    }
-}
-impl RolesSerde of core::serde::Serde::<Roles> {
-    fn serialize(self: @Roles, ref output: core::array::Array<felt252>) {
-        core::serde::Serde::serialize(self.role_ids, ref output)
-    }
-    fn deserialize(ref serialized: core::array::Span<felt252>) -> core::option::Option<Roles> {
-        core::option::Option::Some(Roles {
-            role_ids: core::serde::Serde::deserialize(ref serialized)?,
-        })
-    }
-}
-impl PlayerCopy of core::traits::Copy::<Player>;
-impl PlayerDrop of core::traits::Drop::<Player>;
-impl PlayerSerde of core::serde::Serde::<Player> {
-    fn serialize(self: @Player, ref output: core::array::Array<felt252>) {
-        core::serde::Serde::serialize(self.game, ref output);
-        core::serde::Serde::serialize(self.player, ref output);
-        core::serde::Serde::serialize(self.name, ref output)
-    }
-    fn deserialize(ref serialized: core::array::Span<felt252>) -> core::option::Option<Player> {
-        core::option::Option::Some(Player {
-            game: core::serde::Serde::deserialize(ref serialized)?,
-            player: core::serde::Serde::deserialize(ref serialized)?,
-            name: core::serde::Serde::deserialize(ref serialized)?,
-        })
-    }
-}
\ No newline at end of file