From e5313fb23cdda110bde60b2ed181a197beca1384 Mon Sep 17 00:00:00 2001
From: Stephane Caron <stephane.caron@ens.fr>
Date: Wed, 23 May 2012 17:19:10 -0700
Subject: All figures are OK now

---
 figures/git-merge-conflict.pdf | Bin 0 -> 65447 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 figures/git-merge-conflict.pdf

(limited to 'figures/git-merge-conflict.pdf')

diff --git a/figures/git-merge-conflict.pdf b/figures/git-merge-conflict.pdf
new file mode 100644
index 0000000..9afaa89
Binary files /dev/null and b/figures/git-merge-conflict.pdf differ
-- 
cgit v1.2.3-70-g09d2