Resolving merge conflicts

bbfrederick · Dec 20, 2024 · 79f7b1f · 79f7b1f
1 parent 5dcfa5f
commit 79f7b1f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/rapidtide/refineregressor.py b/rapidtide/refineregressor.py
@@ -97,8 +97,8 @@ def alignvoxels(
     Implicit outputs:
         shiftedtcs - voxelwise fmri data timeshifted to zero lag
         weights - the weights of every timepoint in the final regressor
-        paddedshiftedtcs - voxelwise fmri data timeshifted to zero lag, with a bufffer of padtrs on each end
-        paddedweights - the weights of every timepoint in the final regressor, with a bufffer of padtrs on each end
+        paddedshiftedtcs - voxelwise fmri data timeshifted to zero lag, with a buffer of padtrs on each end
+        paddedweights - the weights of every timepoint in the final regressor, with a buffer of padtrs on each end
 
 
     Parameters