fix conflict

7 years ago · ce6e09a93f
parent 7bb2ffa051 de5a524307
commit ce6e09a93f
1 changed files with 3 additions and 0 deletions
--- a/source/3/3.3/3.3.11/xfburn.rst
+++ b/source/3/3.3/3.3.11/xfburn.rst
@ -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.