4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-28 18:56:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' into fix

Browse Source
This commit is contained in:
erciccione 2017-09-15 14:53:00 +00:00 committed by GitHub
commit 4066cb22ea
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
translations/monero-core_eo.ts
View File

@ -1494,7 +1494,6 @@ Bonvolu plibonigi aŭ konekti al alia demono</translation>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<<<<<<< HEAD
<location filename="../pages/Transfer.qml" line="704"/> <location filename="../pages/Transfer.qml" line="704"/>
<location filename="../pages/Transfer.qml" line="716"/> <location filename="../pages/Transfer.qml" line="716"/>
<source>Wallet is not connected to daemon.</source> <source>Wallet is not connected to daemon.</source>