Fix conflict

Browse Source

...

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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

i/css/bootstrap-theme.min.css.map

Regular → Executable

i/css/bootstrap.min.css

Vendored Regular → Executable

i/css/bootstrap.min.css.map

Regular → Executable

i/css/css_pt_sans.css

Regular → Executable

i/css/dev/bootstrap3/.csscomb.json

Regular → Executable

i/css/dev/bootstrap3/.csslintrc

Regular → Executable

i/css/dev/bootstrap3/responsive-embed.less

Regular → Executable

i/css/dev/bootstrap3/wells.less

Regular → Executable

i/css/dev/fontawesome/list.less

Vendored Regular → Executable

i/css/donate.css

Regular → Executable

i/image/cat.jpg

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.2 KiB After Width:  |  Height:  |  Size: 6.2 KiB

i/image/flags/enru.png

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

i/image/help/addEdge.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 717 KiB After Width:  |  Height:  |  Size: 717 KiB

i/image/help/addEdgeEn.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 MiB After Width:  |  Height:  |  Size: 1.2 MiB

i/image/help/addVertex.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 187 KiB After Width:  |  Height:  |  Size: 187 KiB

i/image/help/addVertexEn.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 134 KiB After Width:  |  Height:  |  Size: 134 KiB

i/image/help/createGraphByMatrixEn.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 482 KiB After Width:  |  Height:  |  Size: 482 KiB

i/image/help/createGrapthByMatrix.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 833 KiB After Width:  |  Height:  |  Size: 833 KiB

i/image/help/findShortPathes.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 556 KiB After Width:  |  Height:  |  Size: 556 KiB

i/image/help/findShortPathesEn.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 509 KiB After Width:  |  Height:  |  Size: 509 KiB

i/image/help/moveObjects.gif

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 274 KiB After Width:  |  Height:  |  Size: 274 KiB

i/image/news/hosting.png

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

i/image/news/payments.png

Regular → Executable

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

i/js/admin/page_test_graphcgi.js

Regular → Executable

i/js/create_algorithm.js

Regular → Executable

i/js/dev/bootstrap3/.jscsrc

Regular → Executable

i/js/dev/bootstrap3/.jshintrc

Regular → Executable

i/js/dev/bootstrap3/bootstrap.js

Vendored Regular → Executable

i/js/userAlgorithm.jstmpl

Regular → Executable