| Chunk |
|---|
| Conflicting content |
|---|
mReferrerChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
<<<<<<< HEAD:src/main/java/com/mixpanel/android/mpmetrics/PersistentIdentity.java
synchronized (sReferrerPrefsLock) {
readReferrerProperties();
sReferrerPrefsDirty = false;
}
}
=======
synchronized (sReferrerPrefsLock) {
readReferrerProperties();
sReferrerPrefsDirty = false;
}
}
>>>>>>> 1409d6f41fa11ff69cefd40a2280caa8db98cc55:src/main/java/com/mixpanel/android/mpmetrics/PersistentProperties.java
};
}
|
| Solution content |
|---|
mReferrerChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
synchronized (sReferrerPrefsLock) {
readReferrerProperties();
sReferrerPrefsDirty = false;
}
}
};
}
|
| File |
|---|
| PersistentIdentity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Synchronized statement |