I'm stupid
parent
041071e61c
commit
8d3ebdbaf7
|
@ -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
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue