diff options
| author | elavington <elavington@hotmail.com> | 2017-08-09 14:31:59 -0400 |
|---|---|---|
| committer | elavington <elavington@hotmail.com> | 2017-08-09 14:31:59 -0400 |
| commit | aec4083e9a37b58a2eb9584818d9dab740e89121 (patch) | |
| tree | 71515fea06863fee3b0272e921518f3be5e3e2b3 | |
| parent | 0548e33b5ffa479db8fa5ea52ae27a4401a8c5ba (diff) | |
| parent | f7d7849fcd6ce02a59db8c5fadc29d1962476493 (diff) | |
| download | cressdna-aec4083e9a37b58a2eb9584818d9dab740e89121.tar.gz cressdna-aec4083e9a37b58a2eb9584818d9dab740e89121.zip | |
Merge branch 'master' of https://github.com/bjc/cressdna
Conflicts:
CRESSresults.html
cgi-bin/classifier.py
index.html
"prep for merge"
Merge branch 'master' of https://github.com/bjc/cressdna
Conflicts:
CRESSresults.html
cgi-bin/classifier.py
index.html
| -rwxr-xr-x | cgi-bin/classifier.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cgi-bin/classifier.py b/cgi-bin/classifier.py index fee11b9..aa97555 100755 --- a/cgi-bin/classifier.py +++ b/cgi-bin/classifier.py @@ -1,4 +1,8 @@ +<<<<<<< HEAD #!/home/erik/bin/python3.6m +======= +#!/home/erik/bin/python3.6 +>>>>>>> f7d7849fcd6ce02a59db8c5fadc29d1962476493 #import packages to be used from sklearn.svm import SVC @@ -19,7 +23,11 @@ else: name='demo' size=len(alignment[0]) +<<<<<<< HEAD html = open("./var/www/html/CRESSresults.html") +======= +html = open("./www.html/CRESSresults.html") +>>>>>>> f7d7849fcd6ce02a59db8c5fadc29d1962476493 page=html.read() @@ -49,4 +57,8 @@ f.close()""" print (output) -quit()
\ No newline at end of file +<<<<<<< HEAD +quit() +======= +quit() +>>>>>>> f7d7849fcd6ce02a59db8c5fadc29d1962476493 |