resolve conflict - merge uat

Author: DavidCramer

assets/banner-1544x500.png

@@ -3,7 +3,7 @@
  * Plugin Name: Cloudinary
  * Plugin URI: https://cloudinary.com/documentation/wordpress_integration
  * Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
- * Version: 2.2.0
+ * Version: 2.2.1
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

assets/banner-772x250.png

@@ -39,7 +39,6 @@
 				}
 
 				&-type {
-					width: 45%;
 					display: inline-block;
 					margin-right: 8px;