Skip to content

GitLab

Commit f4eda53b authored by Nicolò Gualandi's avatar Nicolò Gualandi
Browse files

Update

parent cf53330f
Hide whitespace changes
Inline Side-by-side
data/Decoder_replica2.txt
View file @ f4eda53b
......@@ -3,10 +3,7 @@ UPN05.TAZ TAZ Low UPN05
UPN05.CTRL CTRL Low UPN05
X0826.TAZ TAZ Low UPN03
X0826.CTRL CTRL Low UPN03
<<<<<<< HEAD
X0784.CTRL CTRL High UPN22
X0327.CTRL CTRL High UPN10
=======
>>>>>>> e6e28c9a835d4b9d9f01b2a2e2afe517143e52b4
X0175.TAZ TAZ Low UPN04
X0175.CTRL CTRL Low UPN04
Markdown is supported
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