From 5251b3df104c0bb210c88bd935a7cc1fd41e4537 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周四, 20 5月 2021 11:02:42 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop

---
 .gitignore |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 469799c..5a0a310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 #Visual studio files
 .vs
+/out
 
 # Compiled Static libraries
 *.lai
@@ -20,6 +21,7 @@
 # Cmake generated files
 build/*
 !build/.gitkeep 
+install/*
 
 #eclipse files
 .cproject
@@ -28,6 +30,11 @@
 *.out
 /Default/
 
-product/*
-!product/.gitkeep
+projects/*
+!projects/.gitkeep
 
+**/CMakeCache.txt
+**/CMakeFiles
+/CMakeSettings.json
+/.venv/
+/Pipfile

--
Gitblit v1.9.1