doc fix and skipping publication tests

Author: varmax2511

oci/marketplace_publication_package_test.go

@@ -30,6 +30,7 @@ var (
 )
 
 func TestMarketplacePublicationPackageResource_basic(t *testing.T) {
+	t.Skip("Skip this test till Marketplace automates background processes and reduces the turnaround time.")
 	httpreplay.SetScenario("TestMarketplacePublicationPackageResource_basic")
 	defer httpreplay.SaveScenario()
 

oci/marketplace_publication_test.go

@@ -75,6 +75,8 @@ var (
 )
 
 func TestMarketplacePublicationResource_basic(t *testing.T) {
+	t.Skip("Skip this test till Marketplace automates background processes and reduces the turnaround time.")
+
 	httpreplay.SetScenario("TestMarketplacePublicationResource_basic")
 	defer httpreplay.SaveScenario()
 

website/docs/d/marketplace_listing_package.html.markdown

@@ -55,14 +55,10 @@ The following attributes are exported:
 * `app_catalog_listing_id` - The ID of the listing resource associated with this listing package. For more information, see [AppCatalogListing](https://docs.cloud.oracle.com/en-us/iaas/api/#/en/iaas/latest/AppCatalogListing/) in the Core Services API. 
 * `app_catalog_listing_resource_version` - The resource version of the listing resource associated with this listing package.
 * `description` - Description of this package.
-<<<<<<< ours
+* `image_id` - The id of the image corresponding to the package.
 * `listing_id` - The ID of the listing that the specified package belongs to.
 * `operating_system` - OS used by the listing.
 	* `name` - name of the operating system
-=======
-* `image_id` - The id of the image corresponding to the package.
-* `listing_id` - The id of the listing the specified package belongs to.
->>>>>>> theirs
 * `package_type` - The specified package's type.
 * `pricing` - The model for pricing.
 	* `currency` - The currency of the pricing model.