Skip to content

Commit fe53adf

Browse files
committed
attempt to fix merge conflict
1 parent f79c71f commit fe53adf

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

_data/authors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ likerofjazz:
1111
name: M0r1
1212
url: https://www.youtube.com/watch?v=p3oUHn1gOAY&list=RDp3oUHn1gOAY&start_radio=1
1313
darkfly0213:
14-
name: Z
14+
name: darkfly0213
1515
url: https://github.com/darkfly02131
1616
izzyboop:
1717
name: IzzyBoop

_data/researchers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ likerofjazz:
1111
name: M0r1
1212
url: https://www.youtube.com/watch?v=p3oUHn1gOAY&list=RDp3oUHn1gOAY&start_radio=1
1313
darkfly0213:
14-
name: Z
14+
name: darkfly0213
1515
url: https://github.com/darkfly02131
1616
izzyboop:
1717
name: IzzyBoop

0 commit comments

Comments
 (0)