summaryrefslogtreecommitdiffstats
path: root/figures/git-merge-ok.svg
diff options
context:
space:
mode:
authorStephane Caron <stephane.caron@ens.fr>2012-05-23 16:14:58 -0700
committerStephane Caron <stephane.caron@ens.fr>2012-05-23 16:14:58 -0700
commit7b0a75807136251e404d3c3757ae15b022084f42 (patch)
tree8d9b7079a45cbd61bcdbc4e01f0d2357626718ec /figures/git-merge-ok.svg
parentf76336a8fecbb626accdbf6f7e6ba9f86293d482 (diff)
downloadgit_workshop-7b0a75807136251e404d3c3757ae15b022084f42.tar.gz
kron
Diffstat (limited to 'figures/git-merge-ok.svg')
-rw-r--r--figures/git-merge-ok.svg4
1 files changed, 2 insertions, 2 deletions
diff --git a/figures/git-merge-ok.svg b/figures/git-merge-ok.svg
index 31ec423..560c615 100644
--- a/figures/git-merge-ok.svg
+++ b/figures/git-merge-ok.svg
@@ -486,7 +486,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4142136"
- inkscape:cx="-40.499727"
+ inkscape:cx="129.2059"
inkscape:cy="144.86134"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
@@ -497,7 +497,7 @@
width="12.8cm"
height="9.6cm"
units="cm"
- showgrid="false"
+ showgrid="true"
grid_units="mm"
inkscape:object-paths="false"
inkscape:grid-points="true"