summaryrefslogtreecommitdiff
path: root/fig_clusters_ising2d.eps
diff options
context:
space:
mode:
Diffstat (limited to 'fig_clusters_ising2d.eps')
-rw-r--r--fig_clusters_ising2d.eps9
1 files changed, 9 insertions, 0 deletions
diff --git a/fig_clusters_ising2d.eps b/fig_clusters_ising2d.eps
index fa60ecb..cfab34e 100644
--- a/fig_clusters_ising2d.eps
+++ b/fig_clusters_ising2d.eps
@@ -1,7 +1,12 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Title: fig_clusters_ising2d.tex
+<<<<<<< HEAD
%%Creator: gnuplot 5.2 patchlevel 3
%%CreationDate: Mon May 28 09:40:51 2018
+=======
+%%Creator: gnuplot 5.2 patchlevel 2
+%%CreationDate: Tue May 15 20:44:22 2018
+>>>>>>> 1d0c65c2763b959530bb5033d524bbc46eb1dbf9
%%DocumentFonts:
%%BoundingBox: 50 50 542 252
%%EndComments
@@ -441,7 +446,11 @@ SDict begin [
/Creator (gnuplot 5.2 patchlevel 3)
% /Producer (gnuplot)
% /Keywords ()
+<<<<<<< HEAD
/CreationDate (Mon May 28 09:40:51 2018)
+=======
+ /CreationDate (Tue May 15 20:44:22 2018)
+>>>>>>> 1d0c65c2763b959530bb5033d524bbc46eb1dbf9
/DOCINFO pdfmark
end
} ifelse