Update examples/howto/optimize_rhythmic.py

jonescompneurolab · Jul 29, 2024 · 5295b16 · 5295b16
1 parent c0d13cc
commit 5295b16
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/examples/howto/optimize_rhythmic.py b/examples/howto/optimize_rhythmic.py
@@ -4,17 +4,8 @@
 =========================================
 
 This example demonstrates how to optimize the power spectral density (PSD)
-<<<<<<< HEAD
-<<<<<<< HEAD
 of a current dipole signal with significant alpha and beta spectral
 components.
-=======
-of a sensory evoked response in the alpha and beta frequency bands.
->>>>>>> 72423f24 (add obj func for rhythmic drives, tests, and example)
-=======
-of a current dipole signal with significant alpha and beta spectral
-components.
->>>>>>> 35dd061b (rename variables, update example description)
 """
 
 # Authors: Carolina Fernandez <cxf418@miami.edu>