Commit 378dcb7e authored by jay's avatar jay
Browse files

Finishing the merge cleanly

parent 932c3591

plio/io/io_gpf.py

+7 −14
Original line number Diff line number Diff line 
<<<<<<< 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