Fix merge, include annoying reslns in package.json (tiptap crap)

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

package.json

@@ -74,6 +74,6 @@
     "vue-sanitize": "^0.2.0"
   },
   "resolutions": {
-      "prosemirror-model": "1.8.2"
+    "prosemirror-model": "1.8.2"
   }
 }