From 56c92e4785fa6952e390fd249cd654f0e5b2d83e Mon Sep 17 00:00:00 2001
From: bd <bdunahu@operationnull.com>
Date: Sun, 9 Mar 2025 16:26:36 -0400
Subject: finish merge conflict

---
 inc/cache.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'inc/cache.h')

diff --git a/inc/cache.h b/inc/cache.h
index d9d8ba7..4e4b48d 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -21,7 +21,10 @@ class Cache : public Storage
 	~Cache();
 
 	Response write(Accessor accessor, signed int data, int address) override;
-	Response read(Accessor accessor, int address, std::array<signed int, LINE_SIZE>& data) override;
+	Response read(
+		Accessor accessor,
+		int address,
+		std::array<signed int, LINE_SIZE> &data) override;
 
   private:
 	/**
-- 
cgit v1.2.3