Squashed 'moose-core/' changes from c15c1b1..669b981

669b981 VERSION conflict file is added
29362b6 Merge commit '628138cb'

git-subtree-dir: moose-core
git-subtree-split: 669b981fd06bf9b0919dca08cf87505c2f411802

VERSION

+3.1.1-100-g51a3a30

tests/python/test_difshells.py

@@ -115,7 +115,6 @@ if __name__ == '__main__':
     dend.initVm = Vm_0
     dend.diameter = dend_diameter
     dend.length = dend_length
-
     pulse.delay[0] = 8.
     pulse.width[0] = 500e-3
     pulse.level[0] = inject