fix error during fixing of merge conflict

This commit is contained in:
Jonathan Warren 2013-12-25 00:46:14 -05:00
parent c18ee8e803
commit 2ca0fed227
1 changed files with 1 additions and 2 deletions

View File

@ -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>