Resolve merge conflict in .gitignore
Browse files- .gitignore +4 -0
.gitignore
CHANGED
|
@@ -12,3 +12,7 @@ ALL*
|
|
| 12 |
|
| 13 |
# Ignore all .joblib files
|
| 14 |
*.joblib
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
|
| 13 |
# Ignore all .joblib files
|
| 14 |
*.joblib
|
| 15 |
+
|
| 16 |
+
#iignore all .out files
|
| 17 |
+
*.out
|
| 18 |
+
|