cleanup merge

This commit is contained in:
James B. Pollack 2015-10-15 15:05:34 -07:00
commit aee11d4c06
2 changed files with 2 additions and 2 deletions