chore(merge conflicts): fix merge conflicts

chore #567
softrams · Jan 29, 2021 · a431af0 · a431af0
2 parents 3aa0e94 + ff8614d
commit a431af0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/app.ts b/src/app.ts
@@ -45,7 +45,12 @@ app.use(
   helmet.contentSecurityPolicy({
     directives: {
       defaultSrc: ["'self' blob:", 'stackpath.bootstrapcdn.com'],
-      scriptSrc: ["'self'", 'code.jquery.com', 'stackpath.bootstrapcdn.com'],
+      scriptSrc: [
+        "'self'",
+        'code.jquery.com',
+        'stackpath.bootstrapcdn.com',
+        '${serverIpAddress}',
+      ],
       styleSrc: ["'self'", 'stackpath.bootstrapcdn.com', "'unsafe-inline'"],
     },
   })