Skip to content

Commit

Permalink
Merge pull request #45 from MechMicroMan/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
mikesmic authored Aug 29, 2019
2 parents 88b5573 + 2d11aff commit b48454f
Show file tree
Hide file tree
Showing 98 changed files with 174,367 additions and 1,577 deletions.
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

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

# Declare files that will always have CRLF line endings on checkout.


# Denote all files that are truly binary and should not be modified.
*.ipynb binary
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@
.Trashes
ehthumbs.db
Thumbs.db
.*

# My files #
.ipynb_checkpoints
__pycache__
*.sublime-project
*.sublime-workspace
*.pyc

# Intellij IDE files
.idea/

#Python Virtual Environment
venv/

#Sphinx docs
docs/_build

#Pip install
DefDAP.egg-info/
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @mikesmic @rhysgt
Loading

0 comments on commit b48454f

Please sign in to comment.