From ebee1a02fd22a7f3fcd2feeb400fcbf454143802 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Thu, 5 Feb 2015 11:46:56 +0100
Subject: [PATCH] Promise is already defined in ES6.

---
 packages/xo-lib/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/xo-lib/index.js b/packages/xo-lib/index.js
index a9f77254a..5db09853a 100644
--- a/packages/xo-lib/index.js
+++ b/packages/xo-lib/index.js
@@ -5,7 +5,7 @@
 var assign = require('lodash.assign');
 var forEach = require('lodash.foreach');
 var parseUrl = require('url').parse;
-var Promise = require('bluebird');
+var Bluebird = require('bluebird');
 
 // Support browsers.
 var WebSocket = (function (root) {
@@ -81,10 +81,10 @@ assign(Xo.prototype, {
   connect: function () {
     if (this.status === 'connected')
     {
-      return Promise.cast();
+      return Bluebird.cast();
     }
 
-    var deferred = Promise.defer();
+    var deferred = Bluebird.defer();
 
     this.status = 'connecting';
 
@@ -174,7 +174,7 @@ assign(Xo.prototype, {
         params: params || [],
       }));
 
-      var deferred = this._deferreds[id] = Promise.defer();
+      var deferred = this._deferreds[id] = Bluebird.defer();
 
       return deferred.promise;
     }.bind(this));