From 6789c921f52b5be713a9fb84f6ef6203c8c9b649 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 23 Jul 2014 20:50:06 -0700
Subject: [PATCH] fix whitespace in util.js

---
 src/js/util.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/js/util.js b/src/js/util.js
index eba095fb2..6071a9eac 100644
--- a/src/js/util.js
+++ b/src/js/util.js
@@ -6,10 +6,9 @@
 vjs.util = {};
 
 /**
- * Merge two options objects, 
- * recursively merging any plain object properties as well.
- * Previously `deepMerge`
- * 
+ * Merge two options objects, recursively merging any plain object properties as
+ * well.  Previously `deepMerge`
+ *
  * @param  {Object} obj1 Object to override values in
  * @param  {Object} obj2 Overriding object
  * @return {Object}      New object -- obj1 and obj2 will be untouched