Fixing conflicts in header.
authorZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:40:25 +0000 (16:40 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:40:25 +0000 (16:40 -0400)
commit99a15b56a8d25461bcada061a8f6fa29dce180be
treeaa9c7f64b5fefc4adde0beeffefabd53593ed112
parente6c4a180d18ce5db3cf9406e45ea4f3840821cfa
parentf305701e1071d469897846d83c5c003c7b517d37
Fixing conflicts in header.
2015/header.html