Skip to content
GitLab
Explore
Sign in
tails
wiki
src
doc
first_steps
upgrade.fr.po
Find file
Blame
History
Permalink
Remove leftover conflict marker.
· 6d78221f
Tails developers
authored
Feb 28, 2014
6d78221f
