[IMP] voip: fix DIDWW typos

X-original-commit: dd91090

Author: fhe-odoo

content/applications/productivity/voip/didww.rst

@@ -75,10 +75,22 @@ Under :guilabel:`PBX Server IP`, enter `sip.phone.systems`.
 .. image:: didww/new-provider.png
    :alt: The VoIP providers page in Odoo.
 
+<<<<<<< a9933b1c71f0094f8f0f855b3d252d05f9119e77
 To configure a user's VoIP provider, click the user avatar in the top-right of the database, then
 click :guilabel:`My Preferences`. Click into the :guilabel:`VoIP` tab, then under the :guilabel:`Voip
 Provider` field, select :guilabel:`DIDWW`. Finally, enter the :guilabel:`Voip Username` and
 :guilabel:`Voip Secret`, then save.
+||||||| f69a33f86e60004bff3c4d360d4e3d1be7fa57cb
+To configure a user's VoIP provider, click the user avatar in the top-right of the database, then
+click :guilabel:`My Profile`. Click into the :guilabel:`VoIP` tab, then under the :guilabel:`Voip
+Provider` field, select :guilabel:`DIDWW`. Finally, enter the :guilabel:`Voip Username` and
+:guilabel:`Voip Secret`, then save.
+=======
+To configure a user's VoIP provider, click the user avatar icon in the top-right corner of the
+database, and then choose :guilabel:`My Preferences` from the sub-menu. Then click into the
+:guilabel:`VoIP` tab, and under the :guilabel:`Voip Provider` field, select :guilabel:`DIDWW`.
+Finally, enter the :guilabel:`Voip Username` and :guilabel:`Voip Secret`, then save.
+>>>>>>> 41052341a19be73c4ec9641229843d7849ae40a0
 
 .. image:: didww/odoo-credentials.png
    :alt: DIDWW provider, username, and secret credentials entered.