Web
·
Wiki
·
Activities
·
Blog
·
Lists
·
Chat
·
Meeting
·
Bugs
·
Git
·
Translate
·
Archive
·
People
·
Donate
index
:
dictado/mainline
master
mainline
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
nivel.txt
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
Diffstat
(limited to 'nivel.txt')
-rw-r--r--
nivel.txt
6
1 files changed, 1 insertions, 5 deletions
diff --git a/nivel.txt b/nivel.txt
index f131ba1..d00491f 100644
--- a/
nivel.txt
+++ b/
nivel.txt
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-3
-=======
-2
->>>>>>> Stashed changes
+1