zabawnie

╰─$ git pull origin public
From vcs.cert.pl:enisa/trainings-2017
 * branch            public     -> FETCH_HEAD
Auto-merging docker/procmail/examples/example1
CONFLICT (add/add): Merge conflict in docker/procmail/examples/example1
Auto-merging docker/procmail/README.md
CONFLICT (add/add): Merge conflict in docker/procmail/README.md
Auto-merging docker/procmail/ProcmailBuild.sh
CONFLICT (add/add): Merge conflict in docker/procmail/ProcmailBuild.sh
Auto-merging docker/procmail/Dockerfile
CONFLICT (add/add): Merge conflict in docker/procmail/Dockerfile
Auto-merging docker/MISP/WildHamsterSecBuild.sh
CONFLICT (add/add): Merge conflict in docker/MISP/WildHamsterSecBuild.sh
Auto-merging docker/MISP/WildHamsterSec/config.php
CONFLICT (add/add): Merge conflict in docker/MISP/WildHamsterSec/config.php
Auto-merging docker/MISP/WildHamsterSec/Dockerfile
CONFLICT (add/add): Merge conflict in docker/MISP/WildHamsterSec/Dockerfile
Auto-merging docker/MISP/README.md
CONFLICT (add/add): Merge conflict in docker/MISP/README.md
Auto-merging docker/MISP/MyOrgBuild.sh
CONFLICT (add/add): Merge conflict in docker/MISP/MyOrgBuild.sh
Auto-merging docker/MISP/MyOrg/config.php
CONFLICT (add/add): Merge conflict in docker/MISP/MyOrg/config.php
Auto-merging docker/MISP/MyOrg/Dockerfile
CONFLICT (add/add): Merge conflict in docker/MISP/MyOrg/Dockerfile
Auto-merging docker/HIVE/hive/application.conf
CONFLICT (add/add): Merge conflict in docker/HIVE/hive/application.conf
Auto-merging docker/HIVE/docker-compose.yml
CONFLICT (add/add): Merge conflict in docker/HIVE/docker-compose.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.