[tor-commits] [webwml/master] Fix merge conflict in donate-options page

[hiro at torproject.org]

commit c0cc2905dfc17791109aaeada45d826858e50c08
Merge: e7c3af0b 79d22985
Author: hiromipaw <hiro at torproject.org>
Date:   Tue Dec 26 11:20:41 2017 +0100

    Fix merge conflict in donate-options page

 Makefile.local.sample          | 2 +-
 donate/en/.#donate-options.wml | 1 -
 donate/en/donate-options.wml   | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)