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

commit 2921d7c38d0e0b2a82c0cd0c120abf0518235a6c Merge: 5e90acd5 232e4645 Author: hiromipaw Date: Tue Dec 26 11:18:34 2017 +0100 Fix merge conflict in donate-options page donate/en/.#donate-options.wml | 1 + donate/en/donate-options.wml | 4 2 files changed, 5

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

commit c0cc2905dfc17791109aaeada45d826858e50c08 Merge: e7c3af0b 79d22985 Author: hiromipaw 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 -