Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed file with conflicts

This commit is contained in:
Jan Steemann 2014-05-12 17:22:09 +02:00
parent 027ec2d3f4
commit 658294ecb3
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
View File

@ -785,24 +785,6 @@
delete SYS_GET_TASK; delete SYS_GET_TASK;
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief deletePeriodic
////////////////////////////////////////////////////////////////////////////////
if (typeof SYS_DELETE_PERIODIC !== "undefined") {
exports.deletePeriodic = SYS_DELETE_PERIODIC;
delete SYS_DELETE_PERIODIC;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief getPeriodic
////////////////////////////////////////////////////////////////////////////////
if (typeof SYS_GET_PERIODIC !== "undefined") {
exports.getPeriodic = SYS_GET_PERIODIC;
delete SYS_GET_PERIODIC;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief testPort /// @brief testPort
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

22
js/common/bootstrap/module-internal.js
View File

@ -21,11 +21,7 @@
BYTES_SENT_DISTRIBUTION, BYTES_RECEIVED_DISTRIBUTION, CONNECTION_TIME_DISTRIBUTION, BYTES_SENT_DISTRIBUTION, BYTES_RECEIVED_DISTRIBUTION, CONNECTION_TIME_DISTRIBUTION,
REQUEST_TIME_DISTRIBUTION, DEVELOPMENT_MODE, FE_DEVELOPMENT_MODE, THREAD_NUMBER, LOGFILE_PATH, REQUEST_TIME_DISTRIBUTION, DEVELOPMENT_MODE, FE_DEVELOPMENT_MODE, THREAD_NUMBER, LOGFILE_PATH,
SYS_PLATFORM, SYS_EXECUTE_EXTERNAL, SYS_STATUS_EXTERNAL, SYS_KILL_EXTERNAL, SYS_PLATFORM, SYS_EXECUTE_EXTERNAL, SYS_STATUS_EXTERNAL, SYS_KILL_EXTERNAL,
<<<<<<< HEAD
SYS_DEFINE_PERIODIC, SYS_DELETE_PERIODIC, SYS_GET_PERIODIC, SYS_TEST_PORT */
=======
SYS_REGISTER_TASK, SYS_UNREGISTER_TASK, SYS_GET_TASK, SYS_TEST_PORT */ SYS_REGISTER_TASK, SYS_UNREGISTER_TASK, SYS_GET_TASK, SYS_TEST_PORT */
>>>>>>> 161ac2e427f6cc62d3d79a96b4044327350a8d85
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief module "internal" /// @brief module "internal"
@ -789,24 +785,6 @@
delete SYS_GET_TASK; delete SYS_GET_TASK;
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief deletePeriodic
////////////////////////////////////////////////////////////////////////////////
if (typeof SYS_DELETE_PERIODIC !== "undefined") {
exports.deletePeriodic = SYS_DELETE_PERIODIC;
delete SYS_DELETE_PERIODIC;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief getPeriodic
////////////////////////////////////////////////////////////////////////////////
if (typeof SYS_GET_PERIODIC !== "undefined") {
exports.getPeriodic = SYS_GET_PERIODIC;
delete SYS_GET_PERIODIC;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief testPort /// @brief testPort
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////