Fix bad merge

app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java

@@ -397,16 +397,7 @@ public class SdDataSourceBLE2 extends SdDataSource {
 						+ ", contactStatus=" + sensorContactStatus
 						+ ", notificationCount=" + mSdData.mHrNotificationCount);
                 Log.v(TAG, String.format("%s", "HR Measurement"));
-                // Parse the flags
+
-                int flags = parser.getUInt8();
-                final int unit = flags & 0x01;
-                final int sensorContactStatus = (flags & 0x06) >> 1;
-                final boolean energyExpenditurePresent = (flags & 0x08) > 0;
-                final boolean rrIntervalPresent = (flags & 0x10) > 0;
-                // Parse heart rate
-                mSdData.mHR = (unit == 0) ? parser.getUInt8() : parser.getUInt16();
-                mSdData.mHRTimestamp = System.currentTimeMillis();
-                Log.d(TAG,"Received HR="+mSdData.mHR);
 
             } else if (charUuidStr.equals(CHAR_OSD_ACC_DATA)
                     || charUuidStr.equals(CHAR_INFINITIME_ACC_DATA)) {

app/src/main/java/uk/org/openseizuredetector/SensorValidationActivity.java

@@ -101,7 +101,6 @@ public class SensorValidationActivity extends AppCompatActivity {
 	private long hrStartNotificationCount = 0;
 	private long hrLastSeenNotificationCount = -1;
 
-private final ArrayList<HeartRatePoint> hrPoints = new ArrayList<>();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -560,18 +559,7 @@ private final ArrayList<HeartRatePoint> hrPoints = new ArrayList<>();
 			currentHrLastSeenNotificationCount = hrLastSeenNotificationCount;
 		}
 
-<<<<<<< HEAD
 		SdData sdData = mConnection.mSdServer.mSdData;
-=======
-        long hrTs = mConnection.mSdServer.mSdData.mHRTimestamp;
-        double hr = mConnection.mSdServer.mSdData.mHR;
-        currentHrReadCount++;
-        if (hr >= 0.0 && hrTs != lastHrTimestamp) {
-            lastHrTimestamp = hrTs;
-            currentHrSum += hr;
-            currentHrValidCount++;
-        }
->>>>>>> c175730 (Cosmetic changes)
 
 		currentHrReadCount++;