the-btfash-foundation/tmux-mem-cpu-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove merge leftovers from README

Browse Source
This commit is contained in:
Pawel "l0ner" Soltys 2015-01-17 17:15:01 +01:00
parent acaf9b0b2b
commit 5fdb0e6227
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@ -105,10 +105,7 @@ Contributions from:
* Justin Crawford <justinc@pci-online.net> * Justin Crawford <justinc@pci-online.net>
* krieiter <krieiter@gmail.com> * krieiter <krieiter@gmail.com>
<<<<<<< HEAD
=======
* Mark Palmeri <mlp6@duke.edu> * Mark Palmeri <mlp6@duke.edu>
>>>>>>> upstream/master
.. _tmux: http://tmux.sourceforge.net/ .. _tmux: http://tmux.sourceforge.net/