Skip to content

C
CTF
Commit 3dd5edae authored by Antek Grzanka's avatar Antek Grzanka
Browse files
Options

Sorry, fixed.

parent 300107d1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
service/src/main/resources/assets/statics/js/main.js
View file @ 3dd5edae
...@@ -40,11 +40,7 @@ ...@@ -40,11 +40,7 @@
app.factory('AppSettings', ['$http', function($http) { app.factory('AppSettings', ['$http', function($http) {
// fallback into defaults, if everything fails, world collapses, hell freezes and /startup will not resolve // fallback into defaults, if everything fails, world collapses, hell freezes and /startup will not resolve
<<<<<<< HEAD
var domainName = '52.25.28.64', port = 8080, schema = "http";
=======
var domainName = 'ctf.krakyournet.pl', port = "https", schema = 443; var domainName = 'ctf.krakyournet.pl', port = "https", schema = 443;
>>>>>>> origin/master
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment