diff options
author | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:33:58 -0600 |
---|---|---|
committer | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:33:58 -0600 |
commit | 51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (patch) | |
tree | 21a743c227995a980d2cac71d89cb8abf19698f4 /pt-br/xml-pt.html.markdown | |
parent | f02ad99fdd90c4c522e00aca3b46a0db5dd24083 (diff) |
Removed a conflicting line for PR merge
Diffstat (limited to 'pt-br/xml-pt.html.markdown')
0 files changed, 0 insertions, 0 deletions