From 88cd0922634e6bb20da6ea64209bd62d094b6b4c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:05:57 +0800
Subject: [PATCH] 测试git冲突

---
 pipIrr-platform/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/.gitignore b/pipIrr-platform/.gitignore
index 43a6051..aa8d236 100644
--- a/pipIrr-platform/.gitignore
+++ b/pipIrr-platform/.gitignore
@@ -1,2 +1,3 @@
 target/
 /pipIrr-platform.iml
+/鏂囨。/~$pIrr鎺ュ彛.docx

--
Gitblit v1.8.0