From 8d3ebdbaf71db5b31ada0a6f24980ec6c8aefadb Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Mon, 11 Sep 2017 15:53:27 +0200 Subject: [PATCH] I'm stupid --- www/common/sframe-protocol.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js index 980abf105..1be9d7476 100644 --- a/www/common/sframe-protocol.js +++ b/www/common/sframe-protocol.js @@ -121,12 +121,10 @@ define({ 'EV_FILE_UPLOAD_STATE': true, 'Q_CANCEL_PENDING_FILE_UPLOAD': true, -<<<<<<< HEAD // Make the browser window navigate to a given URL, if no URL is passed then it will reload. 'EV_GOTO_URL': true, -======= + // Present mode URL 'Q_PRESENT_URL_GET_VALUE': true, 'EV_PRESENT_URL_SET_VALUE': true, ->>>>>>> 9271b0c1a860abaf765e9fe6e9948eff4487dc52 });