Built motion from commit ede67897.|2.6.29

[motion2.git] / server / services / ami / realtime / utils.js

diff --git a/server/services/ami/realtime/utils.js b/server/services/ami/realtime/utils.js
index 0feabc7..51800e2 100644 (file)
--- a/server/services/ami/realtime/utils.js
+++ b/server/services/ami/realtime/utils.js
@@ -15,4 +15,4 @@
 // * treaties. The SOFTWARE PRODUCT is licensed, not sold.                        *
 // *                                                                       *
 // *************************************************************************
-var _0x7b86=['hasOwnProperty'];(function(_0x17b6e3,_0x4522ed){var _0x3906f3=function(_0x430f87){while(--_0x430f87){_0x17b6e3['push'](_0x17b6e3['shift']());}};_0x3906f3(++_0x4522ed);}(_0x7b86,0x1ce));var _0x67b8=function(_0x246119,_0x30a4f3){_0x246119=_0x246119-0x0;var _0x59c74f=_0x7b86[_0x246119];return _0x59c74f;};'use strict';function mergeDBDataToRealtime(_0x583814,_0x145778){var _0x1b6838=Object['assign']({},_0x583814);for(var _0x559d50 in _0x145778){if(_0x1b6838[_0x67b8('0x0')](_0x559d50)){_0x1b6838[_0x559d50]=_0x145778[_0x559d50];}}return _0x1b6838;}exports['mergeDBDataToRealtime']=mergeDBDataToRealtime;
\ No newline at end of file
+var _0x1c3d=['mergeDBDataToRealtime','hasOwnProperty'];(function(_0x2dc7c9,_0x3a15f8){var _0x3e6536=function(_0x312829){while(--_0x312829){_0x2dc7c9['push'](_0x2dc7c9['shift']());}};_0x3e6536(++_0x3a15f8);}(_0x1c3d,0x177));var _0xd1c3=function(_0x3aaae2,_0x558dac){_0x3aaae2=_0x3aaae2-0x0;var _0x5b6e34=_0x1c3d[_0x3aaae2];return _0x5b6e34;};'use strict';function mergeDBDataToRealtime(_0xdb6845,_0x9491ca){var _0xed9733=Object['assign']({},_0xdb6845);for(var _0x29b56b in _0x9491ca){if(_0xed9733[_0xd1c3('0x0')](_0x29b56b)){_0xed9733[_0x29b56b]=_0x9491ca[_0x29b56b];}}return _0xed9733;}exports[_0xd1c3('0x1')]=mergeDBDataToRealtime;
\ No newline at end of file