package com.model.products;

public class Product {
<<<<<<< HEAD
 
	private int ID;
	 
	private String name;
	 
	private double price;
	 
	private String description;
	 
	private double discount;
	 
	public void setName(String name)
	{
		this.name = name;
	}
=======

    /*
     * Class methods
     */
    /*
     * Getters and Setters
     */
    public int getID() {
        return ID;
    }

    public void setID(int ID) {
        this.ID = ID;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public double getPrice() {
        return price;
    }

    public void setPrice(double price) {
        this.price = price;
    }

    public String getDescription() {
        return description;
    }

    public void setDescription(String description) {
        this.description = description;
    }

    public double getDiscount() {
        return discount;
    }

    public void setDiscount(double discount) {
        this.discount = discount;
    }

    
     /*
     * Inner methods
     */
    
     /*
     * Attributes
     */
    private int ID;
    private String name;
    private double price;
    private String description;
    private double discount;
>>>>>>> c3ac92f6d1cb04f42c3b8fa393fa0ba4dd7b492c
}

package com.model.products;

public class Product {
    /*
     * Class methods
     */
    /*
     * Getters and Setters
     */
    public int getID() {
        return ID;
    }

    public void setID(int ID) {
        this.ID = ID;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public double getPrice() {
        return price;
    }

    public void setPrice(double price) {
        this.price = price;
    }

    public String getDescription() {
        return description;
    }

    public void setDescription(String description) {
        this.description = description;
    }

    public double getDiscount() {
        return discount;
    }

    public void setDiscount(double discount) {
        this.discount = discount;
    }

    
     /*
     * Inner methods
     */
    
     /*
     * Attributes
     */
    private int ID;
    private String name;
    private double price;
    private String description;
    private double discount;
}

solve netbeans problems