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

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"