Skip to content

Commit

Permalink
fix error during fixing of merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Warren committed Dec 25, 2013
1 parent c18ee8e commit 2ca0fed
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/translations/bitmessage_en_pirate.ts
Expand Up @@ -121,8 +121,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../bitmessageqt/__init__.py" line="832"/>
<source>Waiting for their encryption key. Will request it again soon.</source>
<location filename="../bitmessageqt/__init__.py" line="823"/>
<source>Waiting for their encryption key. Will request it again soon.</source>
<translation type="unfinished"></translation>
</message>
Expand Down

0 comments on commit 2ca0fed

Please sign in to comment.