fix merge conflict

3 years ago · c0686dad99
parent 19863b8fb0
commit c0686dad99
1 changed files with 0 additions and 3 deletions
--- a/www/checkup/main.js
+++ b/www/checkup/main.js
@ -968,11 +968,8 @@ define([
                    $outer,
                    $sandbox,
                    /https:\/\//.test($outer)? $outer.replace('https://', 'wss://') : 'ws:',
-<<<<<<< HEAD
-=======
                    // XXX https://$files_domain
                    // XXX wss://$api_domain
->>>>>>> soon
                ],
                'img-src': ["'self'", 'data:', 'blob:', $outer],
                'media-src': ['blob:'],