fix stash

Author: Laure-di

internal/services/baremetal/server.go

@@ -54,28 +54,11 @@ func ResourceServer() *schema.Resource {
 				Description: "Hostname of the server",
 			},
 			"offer": {
-<<<<<<< Updated upstream
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: "ID or name of the server offer",
-				DiffSuppressFunc: func(_, oldValue, newValue string, d *schema.ResourceData) bool {
-					// remove the locality from the IDs when checking diff
-					if locality.ExpandID(newValue) == locality.ExpandID(oldValue) {
-						return true
-					}
-					// if the offer was provided by name
-					offerName, ok := d.GetOk("offer_name")
-
-					return ok && newValue == offerName
-				},
-=======
 				Type:             schema.TypeString,
 				Required:         true,
 				ForceNew:         true,
 				Description:      "ID or name of the server offer",
 				ValidateDiagFunc: verify.IsUUIDOrNameOffer(),
->>>>>>> Stashed changes
 			},
 			"offer_id": {
 				Type:        schema.TypeString,