infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

I'm stupid

Browse Source
pull/1/head
Caleb James DeLisle 7 years ago
parent 041071e61c
commit 8d3ebdbaf7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
www/common/sframe-protocol.js
Unescape Escape View File

@ -121,12 +121,10 @@ define({
'EV_FILE_UPLOAD_STATE': true, 'EV_FILE_UPLOAD_STATE': true,
'Q_CANCEL_PENDING_FILE_UPLOAD': 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. // Make the browser window navigate to a given URL, if no URL is passed then it will reload.
'EV_GOTO_URL': true, 'EV_GOTO_URL': true,
=======
// Present mode URL // Present mode URL
'Q_PRESENT_URL_GET_VALUE': true, 'Q_PRESENT_URL_GET_VALUE': true,
'EV_PRESENT_URL_SET_VALUE': true, 'EV_PRESENT_URL_SET_VALUE': true,
>>>>>>> 9271b0c1a860abaf765e9fe6e9948eff4487dc52
}); });

Write Preview
Loading…
Cancel
Save