From 6bebf12dc0ffdc96c3d381e2c6beff3526890662 Mon Sep 17 00:00:00 2001
From: Mate Gyurkovics <47427424+mgy42@users.noreply.github.com>
Date: Mon, 18 May 2020 13:57:47 -0500
Subject: [PATCH] conflict

---
 plot_channel_loc.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plot_channel_loc.m b/plot_channel_loc.m
index 27c3301..f1d4b2a 100644
--- a/plot_channel_loc.m
+++ b/plot_channel_loc.m
@@ -20,6 +20,7 @@ function plot_channel_loc(mtg, scalp_dig, channel)
 scatter3(dig_scalp(detector_index,1),dig_scalp(detector_index,2), dig_scalp(detector_index,3),'r','filled','LineWidth',0.2)
 
 % Here is my first edit
-% And here is mine - Mate 
+% And here is mine - Mate
+% conflicting line
 
 end