Skip to content
Snippets Groups Projects
Commit 99e7e366 authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge branch 'dev' into 'master'

Fix: Edited .gitignore to exclude .config folder

See merge request !13
parents 42a91590 ebce18c8
Branches
Tags
1 merge request!13Fix: Edited .gitignore to exclude .config folder
{
"version": 1,
"isRoot": true,
"tools": {
"gitversion.tool": {
"version": "5.11.1",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-version-cli": {
"version": "2.3.1",
"commands": [
"dotnet-version"
]
}
}
}
\ No newline at end of file
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
# User-specific files (MonoDevelop/Xamarin Studio) # User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs *.userprefs
# Database connection for t4 class generation from database
**/*.generated.cs
# Build results # Build results
[Dd]ebug/ [Dd]ebug/
[Dd]ebugPublic/ [Dd]ebugPublic/
...@@ -21,6 +24,7 @@ bld/ ...@@ -21,6 +24,7 @@ bld/
[Bb]in/ [Bb]in/
[Oo]bj/ [Oo]bj/
[Ll]og/ [Ll]og/
[Pp]roperties/
# Visual Studio 2015 cache/options directory # Visual Studio 2015 cache/options directory
.vs/ .vs/
...@@ -265,3 +269,6 @@ __pycache__/ ...@@ -265,3 +269,6 @@ __pycache__/
tools/* tools/*
!tools/packages.config !tools/packages.config
dist/ dist/
# Dotnet Tool Manifest
.config/*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment