~aelkner/schooltool/cando_merge_fix

Viewing all changes in revision 143.

  • Committer: Alan Elkner
  • Date: 2012-11-12 07:26:27 UTC
  • Revision ID: aelkner@gmail.com-20121112072627-v7175e403tl4ho8c
fixed bugs caused by the timing of merges

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: