迁移了之前的仓库

2023-11-24 15:54:13 +08:00
parent 2f420b19a5 106e559563
commit de47a5140d
2 changed files with 13 additions and 0 deletions
--- 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