diff options
| author | erciccione <erciccione@users.noreply.github.com> | 2017-09-15 14:53:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 14:53:00 +0000 |
| commit | 4066cb22ea9e17c831f0f751911814d6fabefcdb (patch) | |
| tree | 70df5c9c70773f7f9721c2270bf34e83c04a5e1c | |
| parent | 78e3cd4a632937c176b31e7997623392306cc6aa (diff) | |
| parent | 3e90c3d8251a418387307f24fa039c739124ff05 (diff) | |
| download | monzero-gui-4066cb22ea9e17c831f0f751911814d6fabefcdb.tar.gz monzero-gui-4066cb22ea9e17c831f0f751911814d6fabefcdb.tar.xz monzero-gui-4066cb22ea9e17c831f0f751911814d6fabefcdb.zip | |
Merge branch 'patch-1' into fix
| -rw-r--r-- | translations/monero-core_eo.ts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/translations/monero-core_eo.ts b/translations/monero-core_eo.ts index 3ff5f712..47c6c1d7 100644 --- a/translations/monero-core_eo.ts +++ b/translations/monero-core_eo.ts @@ -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> |