Skip to content

Commit

Permalink
Merge pull request #41 from bcgov/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
BrandonSharratt authored Feb 1, 2019
2 parents d62cb83 + f919903 commit ed6be7b
Show file tree
Hide file tree
Showing 106 changed files with 3,149 additions and 249 deletions.
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto eol=lf

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dist/
downloads/
eggs/
.eggs/
lib/
#lib/
lib64/
parts/
sdist/
Expand Down Expand Up @@ -206,3 +206,6 @@ venv.bak/

# mypy
.mypy_cache/

#Katalon
config/.metadata
Loading

0 comments on commit ed6be7b

Please sign in to comment.