Projects >> cgeo >>e9fdf1928397d2f31bc5f94030fe4f546c195cfe

Chunk
Conflicting content 
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.annotation.NonNull;

<<<<<<< HEAD
import rx.android.observables.AndroidObservable;
=======
>>>>>>> c1e5ee007e857460cd5b430a92bfa1b919de4931
import rx.functions.Action1;
import rx.functions.Func0;
import rx.functions.Func1;
Solution content 
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.annotation.NonNull;

import rx.android.observables.AndroidObservable;
import rx.functions.Action1;
import rx.functions.Func0;
import rx.functions.Func1;
File
DataStore.java
Developer's decision
Version 1
Kind of conflict
Import