From 8e2d20855d51b3e9695db74d993fe1a6c59d5619 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 18 Jun 2020 11:22:48 +0200
Subject: [PATCH] Fix merge, include annoying reslns in package.json (tiptap
crap)
---
SciPost_v1/settings/base.py | 12 ++++--------
package.json | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/SciPost_v1/settings/base.py b/SciPost_v1/settings/base.py
index 1847a6b53..5ac8a4fe9 100644
--- a/SciPost_v1/settings/base.py
+++ b/SciPost_v1/settings/base.py
@@ -219,12 +219,9 @@ CSP_SCRIPT_SRC = ("'self'", 'scipost.org', "'report-sample'",
'crossmark-cdn.crossref.org',
'www.recaptcha.net', 'www.gstatic.com',
'code.jquery.com',
-<<<<<<< HEAD
'static.mendeley.com',
- 'cdn.jsdelivr.net/npm/vue/dist/vue.js')
-=======
- 'static.mendeley.com', 'cdn.plot.ly')
->>>>>>> master
+ 'cdn.jsdelivr.net/npm/vue/dist/vue.js',
+ 'cdn.plot.ly')
CSP_STYLE_SRC = ("'self'", 'scipost.org', "'report-sample'",
'crossmark-cdn.crossref.org',
"'unsafe-inline'", 'ajax.googleapis.com', 'code.jquery.com',
@@ -449,13 +446,12 @@ CELERY_IMPORTS = ('submissions.tasks',)
ED_ASSIGMENT_DT_DELTA = timedelta(hours=6)
-<<<<<<< HEAD
+
# Mailgun credentials
MAILGUN_DOMAIN_NAME = ''
MAILGUN_API_KEY = ''
-=======
+
# Pawning verification token
# Get one at https://haveibeenpwned.com
HAVE_I_BEEN_PWNED_TOKEN = get_secret('HAVE_I_BEEN_PWNED_TOKEN')
HAVE_I_BEEN_PWNED_API_KEY = get_secret('HAVE_I_BEEN_PWNED_API_KEY')
->>>>>>> master
diff --git a/package.json b/package.json
index 3058c32d5..0d2ca3c75 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,6 @@
"vue-sanitize": "^0.2.0"
},
"resolutions": {
- "prosemirror-model": "1.8.2"
+ "prosemirror-model": "1.8.2"
}
}
--
GitLab