From 32e9b81b579b23d902dcebc1a7172206730d1597 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Thu, 17 Aug 2023 10:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0.gitattibutes=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattibutes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattibutes

diff --git a/.gitattibutes b/.gitattibutes
new file mode 100644
index 00000000..c36262c4
--- /dev/null
+++ b/.gitattibutes
@@ -0,0 +1 @@
+nanopart-server/src/main/resources/bootstrap.yml merge=ours
\ No newline at end of file