Skip to content
Snippets Groups Projects
Commit adfaab91 authored by Luis Salamanca's avatar Luis Salamanca
Browse files

Solve conflict

parents 76f730c2 e664070b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
.gitattributes
+ 0
− 3
View file @ adfaab91
...@@ -241,12 +241,9 @@ data/AB/1993/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text ...@@ -241,12 +241,9 @@ data/AB/1993/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1994/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1994/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1995/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1995/03_correctedmeta.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1973/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1973/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD
data/AB/1975/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1975/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1976/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1976/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
=======
data/AB/1974/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1974/04_correctedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1980/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1980/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
data/AB/1981/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1981/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
>>>>>>> e664070b2412ace18c8f5adafe5e0cf57e0ffce8
data/AB/1977/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text data/AB/1977/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

This GitLab is a part of renkulab.io