Resolving conflict.
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 15 Oct 2014 20:14:06 +0000 (16:14 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 15 Oct 2014 20:14:06 +0000 (16:14 -0400)
commitb04c37e75e20553dd73e56b378790fa8f917de14
tree2df50eeba60f6e73e020a7dc0f0623abd3370977
parent4fb1c997df5d2d93261340d69df1b22d7363fb70
parent7f42cac49296fa2f8a4edf77e475ac35728b2776
Resolving conflict.
2015/scholarships/index.html