Fixing conflicts in header.
authorZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:43:30 +0000 (16:43 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:43:30 +0000 (16:43 -0400)
commit7378a3a290a76cffecb2f45692f45d4e30b61ed9
tree1c54f43b9e733863ecc175b4f3b37c552ba1f990
parent99a15b56a8d25461bcada061a8f6fa29dce180be
Fixing conflicts in header.
2015/header.html