fix conflict in site/footer.mas./
commit320e58deef38af91c46ac02ef0cebd7605c17467
authorLukas Mueller <lam87@cornell.edu>
Fri, 11 May 2018 16:00:53 +0000 (11 12:00 -0400)
committerLukas Mueller <lam87@cornell.edu>
Fri, 11 May 2018 16:00:53 +0000 (11 12:00 -0400)
tree6d28fce322ff9f82a3e88a34df7373e9c5dfdd42
parentf113df06f209614411d1e113cb488e9bc84a508f
parent61628c42b9009f09607535d36368dccd82233a17
fix conflict in site/footer.mas./