From 709859abaded228046b82e3f146adab93fdb0fbe Mon Sep 17 00:00:00 2001
From: ShyProton <shayanr1001@gmail.com>
Date: Mon, 28 Apr 2025 00:58:04 -0400
Subject: [PATCH] fixes some small merge issues

---
 library.gd  |  2 +-
 tabletop.gd | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/library.gd b/library.gd
index 53506dc..a81867a 100644
--- a/library.gd
+++ b/library.gd
@@ -1,6 +1,6 @@
 extends Node2D
 
-var _card_class = preload("res://card.gd")
+var _card_class = preload("res://scenes/card/card.gd")
 
 # Library cards are represented as an array of card IDs.
 var lib_cards: Array[String]
diff --git a/tabletop.gd b/tabletop.gd
index c7f9cd3..0c17226 100644
--- a/tabletop.gd
+++ b/tabletop.gd
@@ -109,19 +109,10 @@ func _ready() -> void:
 	move_child(player, 0)
 
 	cache.get_card_data_from_name("1996 World Champion")
-<<<<<<< HEAD
 	
 	var deck = deck_input.new()
 	add_child(deck)
-	deck.add_new_deck(cards, "Blood rites")
-	
-=======
-
-	# var deck = deck_input.new(cards)
-	# add_child(deck)
->>>>>>> card-rework
-
-	pass  # Replace with function body.
+	deck.add_new_deck(cards, "Blood rites")	
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.