[office/kmymoney/update-docs] doc: Merge branch '5.1' into update-docs

[Jack Ostroff]

Git commit f8016c956ec18d8ee3a522adfce202b9445695b7 by Jack Ostroff.
Committed on 07/01/2023 at 00:33.
Pushed by ostroffjh into branch 'update-docs'.

Merge branch '5.1' into update-docs

M  +6    -0    doc/faq.docbook

https://invent.kde.org/office/kmymoney/commit/f8016c956ec18d8ee3a522adfce202b9445695b7

diff --cc doc/faq.docbook
index b31bcb9d6,4d206ed8d..024e93092
--- a/doc/faq.docbook
+++ b/doc/faq.docbook
@@@ -187,11 -187,9 +187,17 @@@
     Nevertheless, it is easy to change a payee's name: select the Payees View and
     find the entry with the name you want to change.  Click with the &RMB; on the
     payee, select <guimenuitem>Rename payee</guimenuitem> from the context menu,
++<<<<<<< HEAD
 +   and enter the new name.  As an alternative to using the &RMB;, you can just
 +   hit F2 after selecting the payee.  Since the transactions only use a
 +   reference to the payees record, all transactions now show the new
 +   name.</para>
 +    </answer>
++=======
+    and enter the new name.  Since the transactions only use a reference to the
+    payees record, all transactions now show the new name.</para>
+  </answer>
++>>>>>>> 5.1
  </qandaentry>
  
  <qandaentry>