annotate slides/images/tree_conflict2.png @ 116:d45899154815 default tip

Fixed
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 06 Mar 2014 00:48:26 +0900
parents 2e53de70f64e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
79
2e53de70f64e Fixed slide
Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
parents:
diff changeset
1 (binary:image/png)