Commit d6824a93 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Remove missed merge conflict lines

parent ebf61b47
Pipeline #6112 passed with stages
in 3 minutes and 27 seconds
......@@ -27,18 +27,8 @@
<trans-unit id="tx_karma_domain_model_ledgerentry.mutable_value">
<source>Mutable Value</source>
</trans-unit>
<<<<<<< HEAD:extensions/karma/Resources/Private/Language/locallang_db.xlf
<<<<<<< HEAD:extensions/karma/Resources/Private/Language/locallang_db.xlf
<trans-unit id="tx_karma_domain_model_ledgerentry.karma_source">
<source>Karma Source</source>
=======
<trans-unit id="tx_karma_domain_model_ledgerentry.type">
<source>Type</source>
>>>>>>> [FIX] Changed table name from *_ledger_entry to *_ledgerentry:html/typo3conf/ext/karma/Resources/Private/Language/locallang_db.xlf
=======
<trans-unit id="tx_karma_domain_model_ledgerentry.karma_source">
<source>Karma Source</source>
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Resources/Private/Language/locallang_db.xlf
</trans-unit>
<trans-unit id="tx_karma_domain_model_ledgerentry.campaign">
<source>Campaign</source>
......@@ -66,4 +56,4 @@
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
</xliff>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment