Browse files

updates to items concerning the pricing set

  • Loading branch information...
1 parent c979e81 commit 4d2d4cca009648f2fd836be74d79dd5b8dec36f0 @iampersistent iampersistent committed Jul 26, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 lib/Vespolina/Entity/Order/ItemInterface.php
View
4 lib/Vespolina/Entity/Order/ItemInterface.php
@@ -57,11 +57,7 @@ function setParent(OrderInterface $parent);
/**
* Set a pricing set for this item
*
-<<<<<<< HEAD
* @param Vespolina\Entity\Pricing\PricingSetInterface $pricingSet
-=======
- * @param Vespolina\Pricing\PricingSetInterface $pricingSet
->>>>>>> add pricingSet to Item
*/
function setPricingSet(PricingSetInterface $pricingSet);

0 comments on commit 4d2d4cc

Please sign in to comment.