1 files changed, 3 insertions, 0 deletions

diff --git a/data/data_square-4096.dat b/data/data_square-4096.dat
index 92be755..c20fc7f 100644
--- a/data/data_square-4096.dat
+++ b/data/data_square-4096.dat
@@ -231,6 +231,7 @@
 4096 2.219190000000000 0.003716270000000 -1.532958818722084 0.000024244385283 0.776375689436236 0.000027367504881 3.612753320617716 0.185791678044592 4.603481087013527 0.230118251980786
 4096 2.219190000000000 0.005255600000000 -1.538351491405584 0.000024203011902 0.782289808173262 0.000025601376225 3.330290193448026 0.182445824050304 3.726231848340700 0.186311355792018
 4096 2.219190000000000 0.004419420000000 -1.535446559064359 0.000023257555063 0.779192713316548 0.000024689591760 3.414601292368074 0.159108293397347 3.848041105783602 0.192324330524426
+<<<<<<< HEAD
 4096 2.219190000000000 0.008838830000000 -1.549735822825833 0.000023786806372 0.793161835899090 0.000022041746961 3.118352541436563 0.155396508083611 2.677595455738619 0.133622932722448
 4096 2.219190000000000 0.006250000000000 -1.541643294326231 0.000021360157718 0.785635919484961 0.000021797321264 3.249265670827936 0.163329002373242 3.383627627642942 0.169030759271938
 4096 2.219190000000000 0.010511200000000 -1.554676931162415 0.000022544857291 0.797293150243588 0.000020227224855 2.774326612988058 0.145821780998698 2.233239040512960 0.111439021213091
@@ -498,3 +499,5 @@
 4096 2.169190000000000 0.100000000000000 -1.776586856986539 0.000017301959927 0.892306161649298 0.000007725835774 1.678614276597641 0.086615728714766 0.334696563508317 0.016701316813372
 4096 2.169190000000000 0.084089600000000 -1.751026813424001 0.000018186478030 0.886546661997251 0.000008584388036 1.783003866430986 0.090877754421349 0.397259015174436 0.019860006244751
 4096 2.169190000000000 0.059460400000000 -1.709594569428963 0.000016644003763 0.875744865054176 0.000008701084399 1.797628205611451 0.092147530400258 0.491282195923778 0.024555336261293
+=======
+>>>>>>> 19b9e75413387000fb5628fafa1d031726c01fca