*Merge.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/dep/src/zthread/macos/UpTimeStrategy.h b/dep/src/zthread/macos/UpTimeStrategy.h
index f2056e14ca2..0f7962d7eca 100644
--- a/dep/src/zthread/macos/UpTimeStrategy.h
+++ b/dep/src/zthread/macos/UpTimeStrategy.h
@@ -40,7 +40,7 @@ class TimeStrategy {
   unsigned long _s;
 
  public:
-  
+
   TimeStrategy() {
 
     // Get the absolute time in milliseconds relative to the program startup
@@ -53,12 +53,12 @@ class TimeStrategy {
     _ms = now % 1000;
 
   }
-  
+
   inline unsigned long seconds() const {
     return _s;
   }
 
-  inline unsigned long milliseconds() const {  
+  inline unsigned long milliseconds() const {
     return _ms;
   }