Projects >> archaius >>dee0275fd5bde2489d220f14d47f1f8991e66b61

Chunk
Conflicting content 
package com.netflix.archaius;

<<<<<<< HEAD
=======
import com.netflix.archaius.api.Property;
import com.netflix.archaius.api.PropertyListener;
>>>>>>> 09484975e5e6bc58a8fa7cb2a86d886caf34eeac

public abstract class AbstractProperty implements Property {
Solution content 
package com.netflix.archaius;

import com.netflix.archaius.api.Property;
import com.netflix.archaius.api.PropertyListener;
public abstract class AbstractProperty implements Property {
File
AbstractProperty.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;

<<<<<<< HEAD
=======
import javax.annotation.Nullable;

import com.netflix.archaius.api.Config;
import com.netflix.archaius.api.PropertyFactory;
>>>>>>> 09484975e5e6bc58a8fa7cb2a86d886caf34eeac
import org.junit.Assert;
import org.junit.Test;
Solution content 
import javax.annotation.Nullable;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import com.netflix.archaius.api.Config;
import com.netflix.archaius.api.PropertyFactory;
import org.junit.Assert;
import org.junit.Test;
File
ProxyFactoryTest.java
Developer's decision
Version 2
Kind of conflict
Import