diff options
Diffstat (limited to 'cgi-bin')
| -rwxr-xr-x[-rw-r--r--] | cgi-bin/classifier.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cgi-bin/classifier.py b/cgi-bin/classifier.py index 8f8450b..aa97555 100644..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) +<<<<<<< HEAD quit() +======= +quit() +>>>>>>> f7d7849fcd6ce02a59db8c5fadc29d1962476493 |