From 2e6ca1315e0539b63d73b00c790afba27e018b39 Mon Sep 17 00:00:00 2001
From: skalyan3 <skalyan3@ncsu.edu>
Date: Tue, 19 Aug 2025 23:45:33 -0400
Subject: [PATCH] Added a line to create conflict

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c356016d6..057b67c8e 100644
--- a/README.md
+++ b/README.md
@@ -67,3 +67,5 @@ We use [Weblate](https://hosted.weblate.org/projects/frigate-nvr/) to support la
 <img src="https://hosted.weblate.org/widget/frigate-nvr/multi-auto.svg" alt="Translation status" />
 </a>
 
+
+Adding this line just to create a conflict with testbranch_Shuba
\ No newline at end of file