Projects >> vaadin-addressbook-sample >>bb72dec684852450f483ebc9906b7db9dc86b7ac

Chunk
Conflicting content 
package com.vobject.vaadin.addressbook.sample;

<<<<<<< HEAD:src/com/vobject/vaadin/addressbook/sample/VaadinAddressBookApplication.java
import com.vaadin.Application;
=======
import org.dellroad.stuff.vaadin.SpringContextApplication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.context.ConfigurableWebApplicationContext;

>>>>>>> 94d42bcd9c40b1e4c8e7fec232550f3a6e8fee6d:src/main/java/com/vobject/vaadin/addressbook/sample/VaadinAddressBookApplication.java
import com.vaadin.data.Item;
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
Solution content 
package com.vobject.vaadin.addressbook.sample;

import org.dellroad.stuff.vaadin.SpringContextApplication;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import com.vaadin.data.Item;
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
File
VaadinAddressBookApplication.java
Developer's decision
Version 2
Kind of conflict
Import