fix conflict
This commit is contained in:
commit
0a7bb1411b
@ -13,6 +13,10 @@ Screenshot
|
|||||||
----------
|
----------
|
||||||
.. image:: abiword.png
|
.. image:: abiword.png
|
||||||
:width: 80%
|
:width: 80%
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> eb44904c3fb6a917d77b28527c856bccd5241748
|
||||||
|
|
||||||
Useage
|
Useage
|
||||||
------
|
------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user