fix rebase issue

bids-standard · Oct 7, 2020 · ccb817f · ccb817f
1 parent f3ed523
commit ccb817f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/99-appendices/03-hed.md b/src/99-appendices/03-hed.md
@@ -20,14 +20,9 @@ HED subcategory should not be used to annotate events.
 ## Annotating each event
 
 There are several ways to associate HED annotations with events within the BIDS
-<<<<<<< HEAD
 framework.
 The most direct way is to use the `HED` column of the `*_events.tsv`
 file to annotate events.
-=======
-framework. The most direct way is to use the `HED` column of the `*_events.tsv`
-file to annotate events:
->>>>>>> STY: Drop end-of-line white space
 
 Example: An `*_events.tsv` annotated using HED tags for individual events.