fix conflict

This commit is contained in:
Lyn 2018-04-18 15:22:29 -07:00
commit ce6e09a93f

View File

@ -9,11 +9,14 @@ Version
------- -------
Lubuntu ships with version 0.5.5 of xfburn. Lubuntu ships with version 0.5.5 of xfburn.
<<<<<<< HEAD
Screenshot Screenshot
---------- ----------
.. image::xfburn.png .. image::xfburn.png
:width: 80% :width: 80%
=======
>>>>>>> de5a5243079628c22f92304930014d30d603962a
How to launch How to launch
------------- -------------
Go to the menu > Sound and video > xfburn. It also has an icon that looks like a cd disk. Go to the menu > Sound and video > xfburn. It also has an icon that looks like a cd disk.