Finishing the merge cleanly

plio/io/io_gpf.py

-<<<<<<< HEAD
-import math
-=======
->>>>>>> upstream/master
 import numpy as np
 import pandas as pd
 
@@ -47,8 +43,6 @@ def read_gpf(input_data):
     assert int(cnt) == len(df)
 
     return df
-<<<<<<< HEAD
-=======
 
 def save_gpf(df, output_file):
     """
@@ -91,5 +85,4 @@ def save_gpf(df, output_file):
         outGPF.write('{0} {1} {2}\n\n'.format(row['res0'], row['res1'], row['res2']))
 
     outGPF.close()
-    return 0
->>>>>>> upstream/master
+    return