demag_gui.py: fixed merge conflict caused by spelling corrections
demag_gui.py: fixed merge conflict caused by spelling corrections

Caoimhinmg/PmagPy,lfairchild/PmagPy,lfairchild/PmagPy,lfairchild/PmagPy,Caoimhinmg/PmagPy,Caoimhinmg/PmagPy