aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--translations/monero-core_eo.ts1
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>