From 774c722dee0ab1e563fc6a1881064cf8d378acf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= <daniel.cortes.p159@gmail.com>
Date: Tue, 18 Jun 2019 20:40:59 -0400
Subject: [PATCH] Quuize ser bkn y deje un poco la canta

---
 src/main/java/xyz/danielcortes/models/Venta.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/xyz/danielcortes/models/Venta.java b/src/main/java/xyz/danielcortes/models/Venta.java
index ec97149..2ee1b50 100644
--- a/src/main/java/xyz/danielcortes/models/Venta.java
+++ b/src/main/java/xyz/danielcortes/models/Venta.java
@@ -82,9 +82,4 @@ public class Venta {
   public void setEjemplares(List<Ejemplar> ejemplares) {
     this.ejemplares = ejemplares;
   }
-<<<<<<< HEAD
-
-=======
-c
->>>>>>> e25e87e0306e64980cb57d16cd44b011c1e968ec
 }