Remove stashes

james-tanner · james-tanner · commit 0345ccbd7c52 · 2025-07-04T10:54:12.000+01:00
diff --git a/docs/source/case_studies.rst b/docs/source/case_studies.rst
@@ -11,10 +11,7 @@ Contents:
    :maxdepth: 2
 
    case_study_duration.rst
-<<<<<<< Updated upstream
-=======
    case_study_vowel_dynamics.rst
    case_study_sibilants.rst
    case_study_case_study_praat.rst
  
->>>>>>> Stashed changes
