Skip to content

Commit

Permalink
Fix incorrectly fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mpeterss authored Nov 22, 2019
1 parent d99d64b commit 747e8f9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ jobs:
- .

# generating selfsigned certs. Needed for docker compose tests
- run:
name: Generate self signed certs
command: |
scripts/generate-selfsigned-ssl-certs.sh ocs.dev.ostelco.org
cp certs/ocs.dev.ostelco.org/nginx.crt ocsgw/cert/ocs.crt
# - run:
# name: Generate self signed certs
# command: |
# scripts/generate-selfsigned-ssl-certs.sh ocs.dev.ostelco.org
# cp certs/ocs.dev.ostelco.org/nginx.crt ocsgw/cert/ocs.crt
- run:
name: Acceptance Tests
command: docker-compose up --build --abort-on-container-exit
Expand Down

0 comments on commit 747e8f9

Please sign in to comment.