Skip to content

Commit 86ae1be

Browse files
committed
Fixes
1 parent c099c32 commit 86ae1be

File tree

2 files changed

+0
-645
lines changed

2 files changed

+0
-645
lines changed

.dockerignore

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
<<<<<<< HEAD
2-
**/*.pyc
3-
**/*.pyo
4-
**/*.log
5-
.git/
6-
.gitignore
7-
Dockerfile
8-
docker-compose.yml
9-
.env
10-
docs/_build
11-
=======
121
# Docker related
132
development/Dockerfile
143
development/docker-compose*.yml
@@ -36,4 +25,3 @@ LICENSE
3625
**/.vscode/
3726
invoke*.yml
3827
tasks.py
39-
>>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

0 commit comments

Comments
 (0)