From ccf3e614d567c467835861cf3d52fe294f7ec4f1 Mon Sep 17 00:00:00 2001
From: HarshaRani <ranishashi@gmail.com>
Date: Fri, 14 Apr 2017 16:44:04 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from c15c1b1..669b981
669b981 VERSION conflict file is added
29362b6 Merge commit '628138cb9426ec4c1dcf98d3ef8a5108d0ba783b'
git-subtree-dir: moose-core
git-subtree-split: 669b981fd06bf9b0919dca08cf87505c2f411802
---
VERSION | 1 +
tests/python/test_difshells.py | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 VERSION
diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..90dd2fed
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.1.1-100-g51a3a30
diff --git a/tests/python/test_difshells.py b/tests/python/test_difshells.py
index 669f46a8..367b953a 100644
--- a/tests/python/test_difshells.py
+++ b/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
--
GitLab