Merge pull request #109 from NileGraddis/108/remove-merge-junk

remove merge junk from api docs
AllenInstitute · Aug 1, 2018 · 96a863a · 96a863a
2 parents cbe1323 + 73772eb
commit 96a863a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -37,11 +37,7 @@ Calcium transformers
 
 .. autosummary::
    :toctree: generated/
-<<<<<<< HEAD
 
-=======
-
->>>>>>> 14a9cab... :memo: typo in API docs
     calcium.CalciumDeconvolver
     calcium.MedianFilterDetrender
     calcium.SavGolFilterDetrender