Resolved merge conflict with merging 2.3 develop branch.

dverkade · dverkade · commit d43a52f4d919 · 2018-09-05T10:33:27.000+02:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -137,7 +137,6 @@ public function testIsValidFail($product)
         $this->assertFalse($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
-<<<<<<< HEAD
 
     /**
      * Data provider for testValidationNegativePrice
@@ -177,6 +176,4 @@ public function testValidationPrice($title, $type, $priceType, $price, $product)
         $this->assertTrue($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
-=======
->>>>>>> 2.3-develop
 }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public function testIsValidFail($product)`
`137`	`137`	`$this->assertFalse($this->validator->isValid($valueMock));`
`138`	`138`	`$this->assertEquals($messages, $this->validator->getMessages());`
`139`	`139`	`}`
`140`		`-<<<<<<< HEAD`
`141`	`140`
`142`	`141`	`/**`
`143`	`142`	`* Data provider for testValidationNegativePrice`
`@@ -177,6 +176,4 @@ public function testValidationPrice($title, $type, $priceType, $price, $product)`
`177`	`176`	`$this->assertTrue($this->validator->isValid($valueMock));`
`178`	`177`	`$this->assertEquals($messages, $this->validator->getMessages());`
`179`	`178`	`}`
`180`		`-=======`
`181`		`->>>>>>> 2.3-develop`
`182`	`179`	`}`