web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-18 12:24:02 +02:00
Code Releases Activity

Merge pull request #1361 from gutworth/fix-ws

Browse Source 
fix whitespace in util.js
This commit is contained in:
Steve Heffernan 2014-07-25 15:36:46 -07:00
commit e17dd2c68d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/util.js
View File

@ -6,9 +6,8 @@
vjs.util = {}; vjs.util = {};
/** /**
* Merge two options objects, * Merge two options objects, recursively merging any plain object properties as
* recursively merging any plain object properties as well. * well. Previously `deepMerge`
* Previously `deepMerge`
* *
* @param {Object} obj1 Object to override values in * @param {Object} obj1 Object to override values in
* @param {Object} obj2 Overriding object * @param {Object} obj2 Overriding object