1.1.0

CHANGELOG.md

@@ -2,11 +2,7 @@
 
 ### Features
 
-<<<<<<< CHANGELOG.md
 #### CloudAPI
-=======
-## CloudAPI
->>>>>>> CHANGELOG.md
 
 - Account
   - Delete "ResTypes" field in Create/Update request structs
@@ -19,10 +15,7 @@
 - Disks
   - Add fields "PresentTo", "Shareable", "Computes" in Get/List/ListDeleted/ListUnattached/Search response structs
   - Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
-<<<<<<< CHANGELOG.md
   - Add Share/Unshare methods
-=======
->>>>>>> CHANGELOG.md
 - FLIPgroup
   - Add field "ClientNames" in Get response struct
 - Image
@@ -31,11 +24,7 @@
   - Delete "ResTypes" field in Create/Update request structs
   - Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
 
-<<<<<<< CHANGELOG.md
 #### Cloudbroker
-=======
-## Cloudbroker
->>>>>>> CHANGELOG.md
 
 - Account
   - Add fields "SEPs", "ResourceTypes", "PresentTo", "DiskSizeMax", "UniqPools", "Shareable" in Get/List/ListDeleted/ListDisks/ListRG response structs
@@ -44,10 +33,7 @@
 - Disks
   - Add fields "ReferenceID", "Shareable", "PresentTo", "Computes" in List/ListDeleted/ListUnattached/Search response structs
   - Delete fields "ComputeID", "ComputeName" in List/ListDeleted/ListUnattached/Search response structs
-<<<<<<< CHANGELOG.md
   - Add Share/Unshare methods
-=======
->>>>>>> CHANGELOG.md
 - Grid
   - Add fields "SEPs", "DiskSizeMax" in Get/List response structs
 - Image
@@ -60,7 +46,3 @@
   - Delete field "IPAddr" in MassCreate request struct
 - RG
   - Add fields "DiskSizeMax", "Shareable", "SEPs" in Get/List response structs
-<<<<<<< CHANGELOG.md
-
-=======
->>>>>>> CHANGELOG.md