From e06f97b02b161f5356117d0ccc5a9ea9b11fe99e Mon Sep 17 00:00:00 2001
From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:45:50 -0400
Subject: Resolving conflicts

---
 inc/cache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/cache.h')

diff --git a/inc/cache.h b/inc/cache.h
index bc37f54..20a40c2 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -25,7 +25,7 @@ class Cache : public Storage
 	Response read(
 		Accessor accessor,
 		int address,
-		std::array<signed int, LINE_SIZE> &data) override;
+		std::array<signed int, LINE_SIZE> &data_line) override;
 	Response read_word(Accessor accessor, int address, signed int &data) override;
 
 	/**
-- 
cgit v1.2.3