fix conflict
This commit is contained in:
commit
ce6e09a93f
@ -9,11 +9,14 @@ Version
|
||||
-------
|
||||
Lubuntu ships with version 0.5.5 of xfburn.
|
||||
|
||||
<<<<<<< HEAD
|
||||
Screenshot
|
||||
----------
|
||||
.. image::xfburn.png
|
||||
:width: 80%
|
||||
|
||||
=======
|
||||
>>>>>>> de5a5243079628c22f92304930014d30d603962a
|
||||
How to launch
|
||||
-------------
|
||||
Go to the menu > Sound and video > xfburn. It also has an icon that looks like a cd disk.
|
||||
|
Loading…
x
Reference in New Issue
Block a user