tmux/thewtex.tmux-mem-cpu-load
1
0
Fork 0
mirror of https://github.com/thewtex/tmux-mem-cpu-load.git synced 2026-09-10 07:16:16 -04:00
Code Issues Actions 1 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>
* krieiter <krieiter@gmail.com>
<<<<<<< HEAD
=======
* Mark Palmeri <mlp6@duke.edu>
>>>>>>> upstream/master
.. _tmux: http://tmux.sourceforge.net/