summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xqml/wifi-settings/wifi-settings-app.qml24
1 files changed, 0 insertions, 24 deletions
diff --git a/qml/wifi-settings/wifi-settings-app.qml b/qml/wifi-settings/wifi-settings-app.qml
index d2af106..77990f7 100755
--- a/qml/wifi-settings/wifi-settings-app.qml
+++ b/qml/wifi-settings/wifi-settings-app.qml
@@ -89,11 +89,7 @@ ApplicationWindow {
request(wifiAPIpath + 'deactivate', function (o) {
// log the json response
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -114,11 +110,7 @@ ApplicationWindow {
request(wifiAPIpath + 'activate', function (o) {
// log the json response
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
periodicRefresh.start()
@@ -281,11 +273,7 @@ ApplicationWindow {
request(wifiAPIpath + 'scan', function (o) {
// log the json response
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -462,11 +450,7 @@ ApplicationWindow {
request(wifiAPIpath + 'disconnect?network=' + index,
function (o) {
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
} else {
@@ -477,11 +461,7 @@ ApplicationWindow {
function (o) {
// log the json response
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -552,11 +532,7 @@ ApplicationWindow {
request(wifiAPIpath + 'security?passkey=' + passkey,
function (o) {
-<<<<<<< HEAD
//showRequestInfo(o.responseText)
-=======
- showRequestInfo(o.responseText)
->>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
passwordValidateButton.visible = false