Merge branch 'master' into master

7 years ago · 759840e0a1
parent 0a7bb1411b 72389683f2
commit 759840e0a1
1 changed files with 0 additions and 4 deletions
--- a/source/3/3.2/3.2.1/abiword.rst
+++ b/source/3/3.2/3.2.1/abiword.rst
@ -13,10 +13,6 @@ Screenshot
 ----------
 .. image:: abiword.png
   :width: 80%
-<<<<<<< HEAD
-=======
-
->>>>>>> eb44904c3fb6a917d77b28527c856bccd5241748

 Useage
 ------