From 503c9ade981a0913132bd034bac8cab3e7fa4dc0 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Sat, 15 Apr 2017 12:50:25 +0530
Subject: [PATCH] Removed <<<<, === and >>> from improper merge.
---
moose-core/VERSION | 2 +-
moose-examples/snippets/analogStimTable.py | 25 +++++++++-------------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/moose-core/VERSION b/moose-core/VERSION
index a0c5fa17..b9404dbf 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1-160-g4b57369
\ No newline at end of file
+3.1.1-163-g681473b
\ No newline at end of file
diff --git a/moose-examples/snippets/analogStimTable.py b/moose-examples/snippets/analogStimTable.py
index 9b29b6f7..6d2b413c 100644
--- a/moose-examples/snippets/analogStimTable.py
+++ b/moose-examples/snippets/analogStimTable.py
@@ -72,29 +72,24 @@ def analogStimTable():
def main():
"""
-Example of using a StimulusTable as an analog signal source in
-a reaction system. It could be used similarly to give other
-analog inputs to a model, such as a current or voltage clamp signal.
+ Example of using a StimulusTable as an analog signal source in
+ a reaction system. It could be used similarly to give other
+ analog inputs to a model, such as a current or voltage clamp signal.
-This demo creates a StimulusTable and assigns it half a sine wave.
-Then we assign the start time and period over which to emit the wave.
-The output of the StimTable is sent to a pool **a**, which participates
-in a trivial reaction::
+ This demo creates a StimulusTable and assigns it half a sine wave.
+ Then we assign the start time and period over which to emit the wave.
+ The output of the StimTable is sent to a pool **a**, which participates
+ in a trivial reaction::
- table ----> a <===> b
+ table ----> a <===> b
-The output of **a** and **b** are recorded in a regular table
-for plotting.
+ The output of **a** and **b** are recorded in a regular table
+ for plotting.
"""
analogStimTable()
if __name__ == '__main__':
-<<<<<<< HEAD
- main
-=======
main()
->>>>>>> 0e491aa41584cf7a66c0e242374d8ee61660eb7b
-
#
--
GitLab