Fix unresolved conflict that was accidentally committed.
authorDavid Thompson <davet@gnu.org>
Tue, 1 Jul 2014 16:03:52 +0000 (12:03 -0400)
committerDavid Thompson <davet@gnu.org>
Tue, 1 Jul 2014 16:03:52 +0000 (12:03 -0400)
commitfd8ac95b9a5a7bfa259bcb66dce93c417fffb1b8
tree7c455ca7bfd6297acefd8f56e1d0550e77248341
parente27e0b720342df1789daa6e2b06ba8fd2384be53
Fix unresolved conflict that was accidentally committed.
pt-br/index.html