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

0

i/css/bootstrap-theme.min.css.map Normal file → Executable file

0

i/css/bootstrap.min.css vendored Normal file → Executable file

0

i/css/bootstrap.min.css.map Normal file → Executable file

0

i/css/css_pt_sans.css Normal file → Executable file

0

i/css/dev/bootstrap3/.csscomb.json Normal file → Executable file

0

i/css/dev/bootstrap3/.csslintrc Normal file → Executable file

0

i/css/dev/bootstrap3/responsive-embed.less Normal file → Executable file

0

i/css/dev/bootstrap3/wells.less Normal file → Executable file

0

i/css/dev/fontawesome/list.less vendored Normal file → Executable file

0

i/css/donate.css Normal file → Executable file

0

i/image/cat.jpg Normal file → Executable file

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

0

i/image/flags/enru.png Normal file → Executable file

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

0

i/image/help/addEdge.gif Normal file → Executable file

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

0

i/image/help/addEdgeEn.gif Normal file → Executable file

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

0

i/image/help/addVertex.gif Normal file → Executable file

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

0

i/image/help/addVertexEn.gif Normal file → Executable file

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

0

i/image/help/createGraphByMatrixEn.gif Normal file → Executable file

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

0

i/image/help/createGrapthByMatrix.gif Normal file → Executable file

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

0

i/image/help/findShortPathes.gif Normal file → Executable file

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

0

i/image/help/findShortPathesEn.gif Normal file → Executable file

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

0

i/image/help/moveObjects.gif Normal file → Executable file

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

0

i/image/news/hosting.png Normal file → Executable file

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

0

i/image/news/payments.png Normal file → Executable file

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

0

i/js/admin/page_test_graphcgi.js Normal file → Executable file

0

i/js/create_algorithm.js Normal file → Executable file

0

i/js/dev/bootstrap3/.jscsrc Normal file → Executable file

0

i/js/dev/bootstrap3/.jshintrc Normal file → Executable file

0

i/js/dev/bootstrap3/bootstrap.js vendored Normal file → Executable file

0

i/js/userAlgorithm.jstmpl Normal file → Executable file