diff options
| author | Zachary Sloan | 2013-06-19 18:30:59 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-19 18:30:59 +0000 |
| commit | 2ebacd207ee9c65d9239626fc18d2c1a50e08fbc (patch) | |
| tree | 41627942dfce65608d376134ffb00a6765492676 /misc | |
| parent | 0ce9a060640710b5a6e18f71b08d79e51ef71d8a (diff) | |
| parent | 25bd2fa7ac229eb7862fe778fe03eb75ff34368c (diff) | |
| download | genenetwork2-2ebacd207ee9c65d9239626fc18d2c1a50e08fbc.tar.gz | |
Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask
Conflicts:
wqflask/base/data_set.py
wqflask/wqflask/views.py
Fixed a couple conflicts to merge Lei's code related to the correlation page
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/notes.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/notes.txt b/misc/notes.txt index 0819ae02..01f2c96d 100644 --- a/misc/notes.txt +++ b/misc/notes.txt @@ -198,7 +198,8 @@ tidyp -m -i -w 100 index_page.html =========================================== -ps -ax - View processes +ps ax - View processes +ps ux (the "u" is for user) kill (process #) |