Dispenser/.gitignore

.git/
.idea/
*.sln.iml

##
## Visual Studio Code
##
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
=======
.git/
.idea/
>>>>>>> 80593d2e183c48d2489ba8f855b9486fbcf0982c
Merge branch 'master' of https://gitea.haijumasstransfer.com:8443/wangkaiyi/Dispenser # Conflicts: # .gitignore 2024-08-16 07:23:24 +00:00			`.git/`
添加点胶机框架内容 2024-08-16 07:20:09 +00:00			`.idea/`
			`*.sln.iml`

			`##`
			`## Visual Studio Code`
			`##`
			`.vscode/*`
			`!.vscode/settings.json`
			`!.vscode/tasks.json`
			`!.vscode/launch.json`
			`!.vscode/extensions.json`
Merge branch 'master' of https://gitea.haijumasstransfer.com:8443/wangkaiyi/Dispenser # Conflicts: # .gitignore 2024-08-16 07:23:24 +00:00			`=======`
初始化仓库 2024-08-16 03:14:51 +00:00			`.git/`
			`.idea/`
Merge branch 'master' of https://gitea.haijumasstransfer.com:8443/wangkaiyi/Dispenser # Conflicts: # .gitignore 2024-08-16 07:23:24 +00:00			`>>>>>>> 80593d2e183c48d2489ba8f855b9486fbcf0982c`