From e498e61b5a77c6ba55e761cdb90071096183b9c5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 二月 2021 16:07:00 +0800
Subject: [PATCH] Update .gitignore

---
 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index c16695d..1e2b597 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,12 @@
 bld/
 [Bb]in/
 [Oo]bj/
+<<<<<<< Updated upstream
 HDL-ON_iOS/
 .vs
+=======
+.vs/
+>>>>>>> Stashed changes
 
 # Roslyn cache directories
 *.ide/
@@ -59,6 +63,7 @@
 *.pidb
 *.svclog
 *.scc
+*.DS_Store
 
 # Chutzpah Test files
 _Chutzpah*

--
Gitblit v1.8.0