resolve conflict in nmrDataMod.py Commented out gits complaints, looks like the code is ok this way.
resolve conflict in nmrDataMod.py
Commented out gits complaints, looks like the code is ok this way.

kourk0am/pyNMR,bennomeier/pyNMR