merged with origin master

wilk · wilk · commit 6b29d4225841 · 2014-05-12T20:14:46.000+02:00
diff --git a/WebSocket.js b/WebSocket.js
@@ -169,6 +169,7 @@ Ext.define('Ext.ux.data.proxy.WebSocket', {
      *         }
      *       }
      *     });
+<<<<<<< HEAD
      *
      * @return {Ext.ux.WebSocket} An instance of Ext.ux.WebSocket or null if an error occurred.
      */

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ Ext.define('Ext.ux.data.proxy.WebSocket', {`
`169`	`169`	`* }`
`170`	`170`	`* }`
`171`	`171`	`* });`
	`172`	`+<<<<<<< HEAD`
`172`	`173`	`*`
`173`	`174`	`* @return {Ext.ux.WebSocket} An instance of Ext.ux.WebSocket or null if an error occurred.`
`174`	`175`	`*/`