Merge pull request #2 from shubashwetha/conflictBranch_Shuba

Added a line to create conflict
This commit is contained in:
Shuba shwetha 2025-08-19 23:46:42 -04:00 committed by GitHub
commit 0522521c12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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