Skip to content

Commit 8dfefe3

Browse files
committed
fix: resolving conflicts
1 parent d723048 commit 8dfefe3

File tree

1 file changed

+1
-4
lines changed
  • playbooks/roles/common_vars/defaults

1 file changed

+1
-4
lines changed

playbooks/roles/common_vars/defaults/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ COMMON_PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
5757
COMMON_NPM_MIRROR_URL: 'https://registry.npmjs.org'
5858
COMMON_UBUNTU_APT_KEYSERVER: "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search="
5959

60-
common_digicert_name: "DigiCertSHA2SecureServerCA.crt"
61-
common_digicert_base_url: "https://cacerts.digicert.com"
62-
6360
COMMON_EDX_PPA: "deb http://ppa.edx.org {{ ansible_distribution_release }} main"
6461
COMMON_EDX_PPA_KEY_SERVER: "keyserver.ubuntu.com"
6562
COMMON_EDX_PPA_KEY_ID: "69464050"
@@ -307,4 +304,4 @@ CONFIGURE_JWTS: false
307304
COMMON_RETIREMENT_SERVICE_SETUP: false
308305

309306
# How to log in as "lms" to xqueue.
310-
COMMON_XQUEUE_LMS_PASSWORD: password
307+
COMMON_XQUEUE_LMS_PASSWORD: password

0 commit comments

Comments
 (0)