fix conflict

2018-04-20 13:17:25 -07:00 · 2018-04-20 13:17:25 -07:00 · 0a7bb1411b
commit 0a7bb1411b
parent 4addb3238e eb44904c3f
1 changed files with 4 additions and 0 deletions
--- a/source/3/3.2/3.2.1/abiword.rst
+++ b/source/3/3.2/3.2.1/abiword.rst
@ -13,6 +13,10 @@ Screenshot
 ----------
 .. image:: abiword.png
   :width: 80%
+<<<<<<< HEAD
+=======
+
+>>>>>>> eb44904c3fb6a917d77b28527c856bccd5241748

 Useage
 ------