From a038d778ef0c2b62378146fa8b7bdc069e40e440 Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Tue, 4 Mar 2025 11:07:23 +0700
Subject: [PATCH] update

---
 .gitattributes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 55dc7bd8f..8232aa1c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
-*.po merge=ours
\ No newline at end of file
+*.po merge=ours
+.gitignore merge=ours
+.gitmodules merge=ours
\ No newline at end of file