diff --git a/.gitignore b/.gitignore
index ae0f34e..e662ff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
+<<<<<<< HEAD
 # ---> C
 # Prerequisites
 *.d
@@ -99,3 +100,5 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
+=======
+>>>>>>> 106e5595630b47a33778a4571588a9f739f6a80b
diff --git a/bin/read.txt b/bin/read.txt
index 50a5388..cedb50a 100644
--- a/bin/read.txt
+++ b/bin/read.txt
@@ -1 +1,11 @@
+/*
+ * @Author: zhaojingkui 1553836110@qq.com
+ * @Date: 2023-11-20 10:18:45
+ * @LastEditors: zhaojingkui 1553836110@qq.com
+ * @LastEditTime: 2023-11-24 15:53:35
+ * @FilePath: /aaaaa/bin/read.txt
+ * @Description: 
+ * 
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
+ */
 可执行文件存放目录，程序列表如下：
\ No newline at end of file