Fix conflict

This commit is contained in:
/usr/bin/nano
2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions

0
tmp/auto_merge_css_js/css/.gitignore vendored Normal file → Executable file
View File

0
tmp/donate/total.txt Normal file → Executable file
View File

50
tmp/donate/transactions.txt Normal file → Executable file
View File

@@ -1 +1,51 @@
100
29
98
100
100
29
29
100
100
24
100
100
170
98
100
100
294
100
100
490
100
100
196
1218
29
100
100
100
100
29
100
100
100
100
100
100
100
100
98
100
100
100
100
100
100
100
100
100
100
100
100

0
tmp/saved/.gitignore vendored Normal file → Executable file
View File

5
tmp/saved/samples.cvs Normal file → Executable file
View File

@@ -6,3 +6,8 @@ BipartiteGraph|"Двудольный граф"|"Bipartite graph"
weightedGraph|"Пример взвешенного графа"|"Weighted graph"
bigTree|"Большое дерево"|"Big Tree"
russiaCenter|"Граф центрально европейских городов России"|"Graph of Central European cities Russian"
HamiltonianGraph|"Гамильтонов граф"|"Hamiltonian Graph"
VUoKQmCvjhUWrvCp|"Царство растений"|"The kingdom Plantae (russian)"
Heart|"Граф в виде Сердце"|"Graph like heart"
UmWdDFZTNHBfSSQEZZcst|"Серый стиль"|"Gray style"
BlueColor|"Синий стиль"|"Blue style"

395
tmp/vote/vote.txt Normal file → Executable file
View File

@@ -0,0 +1,395 @@
2
0
0
1
4
1
0
0
0
4
1
0
4
0
1
3
3
1
2
1
2
2
1
2
3
5
4
0
0
0
1
3
1
2
3
0
0
0
0
5
2
3
3
4
5
4
5
4
1
1
1
1
4
0
0
0
2
2
1
5
0
1
1
1
1
2
5
0
5
2
0
0
1
4
4
4
4
4
4
2
3
5
4
0
0
2
4
1
1
1
0
1
0
5
0
3
3
0
1
0
2
0
0
1
5
3
5
3
5
1
5
5
1
3
0
1
1
5
0
2
5
1
2
3
3
4
1
0
2
1
0
0
2
0
4
3
5
2
2
3
4
3
1
1
0
0
0
4
0
4
5
0
3
1
1
1
2
2
3
2
1
4
3
2
5
2
5
4
5
0
5
2
1
2
4
3
2
5
3
3
5
3
0
2
0
1
2
4
2
3
5
0
3
4
0
0
0
0
3
0
0
2
3
1
1
2
1
3
5
1
0
5
4
0
0
3
5
0
5
2
3
1
1
1
0
0
0
4
0
1
1
1
2
3
0
5
4
0
0
3
1
4
4
3
1
1
0
0
1
0
5
0
4
1
0
5
5
1
0
2
0
3
2
1
1
2
2
1
2
0
5
3
5
3
3
0
1
0
5
3
1
1
0
5
1
0
2
4
5
1
2
0
5
5
5
3
3
2
2
4
1
4
1
5
3
3
1
0
5
0
3
0
0
0
0
0
0
1
4
2
4
2
0
5
1
3
2
4
0
1
0
1
3
3
2
3
5
0
3
2
2
3
0
1
0
3
3
0
3
1
2
4
1
1
2
1
1
0
1
5
2
1
0
0
3
3
1
5
3
1
1
5
1
2
1
4
5
5
0
0
4
2
0
0
1
0
2
3
4
1
0
0
0
0

0
tmp/vote/voteTopics.txt_en Normal file → Executable file
View File

0
tmp/vote/voteTopics.txt_ru Normal file → Executable file
View File

0
tmp/wiki/css1486493398.css Normal file → Executable file
View File

0
tmp/wiki/css1486493398.css.gz Normal file → Executable file
View File