Merge branch 'patch-1' into fix

This commit is contained in:
erciccione 2017-09-15 14:53:00 +00:00 committed by GitHub
commit 4066cb22ea

View File

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