Fix wrong merge

Browse Source

...

This commit is contained in:

Paulo Gustavo Veiga 2022-02-08 18:19:43 -08:00

parent 311ee44f5e

commit f897ac0358

324 changed files with 1 additions and 29342 deletions

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

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

packages/mindplot/assets/icons

arrow_down.gifarrow_down.pngarrow_left.pngarrow_merge.pngarrow_right.pngarrow_up.pngarrowc_rotate_anticlockwise.pngarrowc_rotate_clockwise.pngarrowc_turn_left.pngarrowc_turn_right.pngbomb.pngbulb_light_off.pngbulb_light_on.pngchart_bar.pngchart_curve.pngchart_line.pngchart_organisation.pngchart_pie.pngclose.pngface_crying.pngface_plain.pngface_sad.pngface_smile-big.pngface_smile.pngface_surprise.pngface_wink.pngflag_blue.pngflag_green.pngflag_orange.pngflag_pink.pngflag_purple.pngflag_yellow.pngfuny_angel.pngfuny_devilish.pngfuny_glasses.pngfuny_grin.pngfuny_kiss.pngfuny_monkey.pnggener_female.pnggener_male.pnghard_cd.pnghard_computer.pnghard_controller.pnghard_drive_cd.pnghard_driver_disk.pnghard_ipod.pnghard_keyboard.pnghard_mouse.pnghard_printer.pnglock_close.pnglock_open.pngmail_edit.pngmail_envelop.pngmail_list.pngmail_mailbox.pngmoney_coins.pngmoney_dollar.pngmoney_euro.pngmoney_money.pngmoney_pound.pngmoney_ruby.pngmoney_yen.pngnumber_1.pngnumber_2.pngnumber_3.pngnumber_4.pngnumber_5.pngnumber_6.pngnumber_7.pngnumber_8.pngnumber_9.pngobject_bell.pngobject_cake.pngobject_camera.pngobject_clanbomber.pngobject_clip.pngobject_house.pngobject_key.pngobject_magnifier.pngobject_music.pngobject_palette.pngobject_pencil.pngobject_phone.pngobject_rainbow.pngobject_star.pngobject_wizard.pngonoff_add.pngonoff_clock.pngonoff_clock_red.pngonoff_delete.pngpeople_female1.pngpeople_female2.pngpeople_group.pngpeople_male1.pngpeople_male2.pngsign_cancel.pngsign_closed.pngsign_exclamation.pngsign_help.pngsign_info.png

Show More

BIN

packages/mindplot/assets/icons/arrow_down.gif

Binary file not shown.

Side by Side Before (image error) Size: 62 B

BIN

packages/mindplot/assets/icons/arrow_down.png

Binary file not shown.

Side by Side Before (image error) Size: 379 B

BIN

packages/mindplot/assets/icons/arrow_left.png

Binary file not shown.

Side by Side Before (image error) Size: 345 B

BIN

packages/mindplot/assets/icons/arrow_merge.png

Binary file not shown.

Side by Side Before (image error) Size: 484 B

BIN

packages/mindplot/assets/icons/arrow_right.png

Binary file not shown.

Side by Side Before (image error) Size: 409 B

BIN

packages/mindplot/assets/icons/arrow_up.png

Binary file not shown.

Side by Side Before (image error) Size: 372 B

BIN

packages/mindplot/assets/icons/arrowc_rotate_anticlockwise.png

Binary file not shown.

Side by Side Before (image error) Size: 608 B

BIN

packages/mindplot/assets/icons/arrowc_rotate_clockwise.png

Binary file not shown.

Side by Side Before (image error) Size: 602 B

BIN

packages/mindplot/assets/icons/arrowc_turn_left.png

Binary file not shown.

Side by Side Before (image error) Size: 516 B

BIN

packages/mindplot/assets/icons/arrowc_turn_right.png

Binary file not shown.

Side by Side Before (image error) Size: 489 B

BIN

packages/mindplot/assets/icons/bomb.png

Binary file not shown.

Side by Side Before (image error) Size: 793 B

BIN

packages/mindplot/assets/icons/bulb_light_off.png

Binary file not shown.

Side by Side Before (image error) Size: 700 B

BIN

packages/mindplot/assets/icons/bulb_light_on.png

Binary file not shown.

Side by Side Before (image error) Size: 782 B

BIN

packages/mindplot/assets/icons/chart_bar.png

Binary file not shown.

Side by Side Before (image error) Size: 541 B

BIN

packages/mindplot/assets/icons/chart_curve.png

Binary file not shown.

Side by Side Before (image error) Size: 710 B

BIN

packages/mindplot/assets/icons/chart_line.png

Binary file not shown.

Side by Side Before (image error) Size: 526 B

BIN

packages/mindplot/assets/icons/chart_organisation.png

Binary file not shown.

Side by Side Before (image error) Size: 444 B

BIN

packages/mindplot/assets/icons/chart_pie.png

Binary file not shown.

Side by Side Before (image error) Size: 918 B

BIN

packages/mindplot/assets/icons/close.png

Binary file not shown.

Side by Side Before (image error) Size: 3.7 KiB

BIN

packages/mindplot/assets/icons/face_crying.png

Binary file not shown.

Side by Side Before (image error) Size: 936 B

BIN

packages/mindplot/assets/icons/face_plain.png

Binary file not shown.

Side by Side Before (image error) Size: 894 B

BIN

packages/mindplot/assets/icons/face_sad.png

Binary file not shown.

Side by Side Before (image error) Size: 918 B

BIN

packages/mindplot/assets/icons/face_smile-big.png

Binary file not shown.

Side by Side Before (image error) Size: 896 B

BIN

packages/mindplot/assets/icons/face_smile.png

Binary file not shown.

Side by Side Before (image error) Size: 919 B

BIN

packages/mindplot/assets/icons/face_surprise.png

Binary file not shown.

Side by Side Before (image error) Size: 917 B

BIN

packages/mindplot/assets/icons/face_wink.png

Binary file not shown.

Side by Side Before (image error) Size: 914 B

BIN

packages/mindplot/assets/icons/flag_blue.png

Binary file not shown.

Side by Side Before (image error) Size: 671 B

BIN

packages/mindplot/assets/icons/flag_green.png

Binary file not shown.

Side by Side Before (image error) Size: 672 B

BIN

packages/mindplot/assets/icons/flag_orange.png

Binary file not shown.

Side by Side Before (image error) Size: 669 B

BIN

packages/mindplot/assets/icons/flag_pink.png

Binary file not shown.

Side by Side Before (image error) Size: 651 B

BIN

packages/mindplot/assets/icons/flag_purple.png

Binary file not shown.

Side by Side Before (image error) Size: 656 B

BIN

packages/mindplot/assets/icons/flag_yellow.png

Binary file not shown.

Side by Side Before (image error) Size: 671 B

BIN

packages/mindplot/assets/icons/funy_angel.png

Binary file not shown.

Side by Side Before (image error) Size: 992 B

BIN

packages/mindplot/assets/icons/funy_devilish.png

Binary file not shown.

Side by Side Before (image error) Size: 855 B

BIN

packages/mindplot/assets/icons/funy_glasses.png

Binary file not shown.

Side by Side Before (image error) Size: 949 B

BIN

packages/mindplot/assets/icons/funy_grin.png

Binary file not shown.

Side by Side Before (image error) Size: 905 B

BIN

packages/mindplot/assets/icons/funy_kiss.png

Binary file not shown.

Side by Side Before (image error) Size: 919 B

BIN

packages/mindplot/assets/icons/funy_monkey.png

Binary file not shown.

Side by Side Before (image error) Size: 784 B

BIN

packages/mindplot/assets/icons/gener_female.png

Binary file not shown.

Side by Side Before (image error) Size: 590 B

BIN

packages/mindplot/assets/icons/gener_male.png

Binary file not shown.

Side by Side Before (image error) Size: 629 B

BIN

packages/mindplot/assets/icons/hard_cd.png

Binary file not shown.

Side by Side Before (image error) Size: 673 B

BIN

packages/mindplot/assets/icons/hard_computer.png

Binary file not shown.

Side by Side Before (image error) Size: 667 B

BIN

packages/mindplot/assets/icons/hard_controller.png

Binary file not shown.

Side by Side Before (image error) Size: 666 B

BIN

packages/mindplot/assets/icons/hard_drive_cd.png

Binary file not shown.

Side by Side Before (image error) Size: 734 B

BIN

packages/mindplot/assets/icons/hard_driver_disk.png

Binary file not shown.

Side by Side Before (image error) Size: 620 B

BIN

packages/mindplot/assets/icons/hard_ipod.png

Binary file not shown.

Side by Side Before (image error) Size: 463 B

BIN

packages/mindplot/assets/icons/hard_keyboard.png

Binary file not shown.

Side by Side Before (image error) Size: 570 B

BIN

packages/mindplot/assets/icons/hard_mouse.png

Binary file not shown.

Side by Side Before (image error) Size: 634 B

BIN

packages/mindplot/assets/icons/hard_printer.png

Binary file not shown.

Side by Side Before (image error) Size: 731 B

BIN

packages/mindplot/assets/icons/lock_close.png

Binary file not shown.

Side by Side Before (image error) Size: 749 B

BIN

packages/mindplot/assets/icons/lock_open.png

Binary file not shown.

Side by Side Before (image error) Size: 727 B

BIN

packages/mindplot/assets/icons/mail_edit.png

Binary file not shown.

Side by Side Before (image error) Size: 880 B

BIN

packages/mindplot/assets/icons/mail_envelop.png

Binary file not shown.

Side by Side Before (image error) Size: 641 B

BIN

packages/mindplot/assets/icons/mail_list.png

Binary file not shown.

Side by Side Before (image error) Size: 566 B

BIN

packages/mindplot/assets/icons/mail_mailbox.png

Binary file not shown.

Side by Side Before (image error) Size: 555 B

BIN

packages/mindplot/assets/icons/money_coins.png

Binary file not shown.

Side by Side Before (image error) Size: 732 B

BIN

packages/mindplot/assets/icons/money_dollar.png

Binary file not shown.

Side by Side Before (image error) Size: 630 B

BIN

packages/mindplot/assets/icons/money_euro.png

Binary file not shown.

Side by Side Before (image error) Size: 605 B

BIN

packages/mindplot/assets/icons/money_money.png

Binary file not shown.

Side by Side Before (image error) Size: 738 B

BIN

packages/mindplot/assets/icons/money_pound.png

Binary file not shown.

Side by Side Before (image error) Size: 565 B

BIN

packages/mindplot/assets/icons/money_ruby.png

Binary file not shown.

Side by Side Before (image error) Size: 592 B

BIN

packages/mindplot/assets/icons/money_yen.png

Binary file not shown.

Side by Side Before (image error) Size: 562 B

BIN

packages/mindplot/assets/icons/number_1.png

Binary file not shown.

Side by Side Before (image error) Size: 3.4 KiB

BIN

packages/mindplot/assets/icons/number_2.png

Binary file not shown.

Side by Side Before (image error) Size: 3.5 KiB

BIN

packages/mindplot/assets/icons/number_3.png

Binary file not shown.

Side by Side Before (image error) Size: 3.6 KiB

BIN

packages/mindplot/assets/icons/number_4.png

Binary file not shown.

Side by Side Before (image error) Size: 3.5 KiB

BIN

packages/mindplot/assets/icons/number_5.png

Binary file not shown.

Side by Side Before (image error) Size: 3.6 KiB

BIN

packages/mindplot/assets/icons/number_6.png

Binary file not shown.

Side by Side Before (image error) Size: 3.6 KiB

BIN

packages/mindplot/assets/icons/number_7.png

Binary file not shown.

Side by Side Before (image error) Size: 3.4 KiB

BIN

packages/mindplot/assets/icons/number_8.png

Binary file not shown.

Side by Side Before (image error) Size: 3.6 KiB

BIN

packages/mindplot/assets/icons/number_9.png

Binary file not shown.

Side by Side Before (image error) Size: 3.6 KiB

BIN

packages/mindplot/assets/icons/object_bell.png

Binary file not shown.

Side by Side Before (image error) Size: 789 B

BIN

packages/mindplot/assets/icons/object_cake.png

Binary file not shown.

Side by Side Before (image error) Size: 676 B

BIN

packages/mindplot/assets/icons/object_camera.png

Binary file not shown.

Side by Side Before (image error) Size: 665 B

BIN

packages/mindplot/assets/icons/object_clanbomber.png

Binary file not shown.

Side by Side Before (image error) Size: 793 B

BIN

packages/mindplot/assets/icons/object_clip.png

Binary file not shown.

Side by Side Before (image error) Size: 391 B

BIN

packages/mindplot/assets/icons/object_house.png

Binary file not shown.

Side by Side Before (image error) Size: 806 B

BIN

packages/mindplot/assets/icons/object_key.png

Binary file not shown.

Side by Side Before (image error) Size: 612 B

BIN

packages/mindplot/assets/icons/object_magnifier.png

Binary file not shown.

Side by Side Before (image error) Size: 615 B

BIN

packages/mindplot/assets/icons/object_music.png

Binary file not shown.

Side by Side Before (image error) Size: 385 B

BIN

packages/mindplot/assets/icons/object_palette.png

Binary file not shown.

Side by Side Before (image error) Size: 856 B

BIN

packages/mindplot/assets/icons/object_pencil.png

Binary file not shown.

Side by Side Before (image error) Size: 450 B

BIN

packages/mindplot/assets/icons/object_phone.png

Binary file not shown.

Side by Side Before (image error) Size: 488 B

BIN

packages/mindplot/assets/icons/object_rainbow.png

Binary file not shown.

Side by Side Before (image error) Size: 655 B

BIN

packages/mindplot/assets/icons/object_star.png

Binary file not shown.

Side by Side Before (image error) Size: 670 B

BIN

packages/mindplot/assets/icons/object_wizard.png

Binary file not shown.

Side by Side Before (image error) Size: 570 B

BIN

packages/mindplot/assets/icons/onoff_add.png

Binary file not shown.

Side by Side Before (image error) Size: 733 B

BIN

packages/mindplot/assets/icons/onoff_clock.png

Binary file not shown.

Side by Side Before (image error) Size: 882 B

BIN

packages/mindplot/assets/icons/onoff_clock_red.png

Binary file not shown.

Side by Side Before (image error) Size: 889 B

BIN

packages/mindplot/assets/icons/onoff_delete.png

Binary file not shown.

Side by Side Before (image error) Size: 715 B

BIN

packages/mindplot/assets/icons/people_female1.png

Binary file not shown.

Side by Side Before (image error) Size: 663 B

BIN

packages/mindplot/assets/icons/people_female2.png

Binary file not shown.

Side by Side Before (image error) Size: 722 B

BIN

packages/mindplot/assets/icons/people_group.png

Binary file not shown.

Side by Side Before (image error) Size: 753 B

BIN

packages/mindplot/assets/icons/people_male1.png

Binary file not shown.

Side by Side Before (image error) Size: 748 B

BIN

packages/mindplot/assets/icons/people_male2.png

Binary file not shown.

Side by Side Before (image error) Size: 741 B

BIN

packages/mindplot/assets/icons/sign_cancel.png

Binary file not shown.

Side by Side Before (image error) Size: 587 B

BIN

packages/mindplot/assets/icons/sign_closed.png

Binary file not shown.

Side by Side Before (image error) Size: 715 B

BIN

packages/mindplot/assets/icons/sign_exclamation.png

Binary file not shown.

Side by Side Before (image error) Size: 701 B

BIN

packages/mindplot/assets/icons/sign_help.png

Binary file not shown.

Side by Side Before (image error) Size: 786 B

BIN

packages/mindplot/assets/icons/sign_info.png

Binary file not shown.

Side by Side Before (image error) Size: 778 B

Some files were not shown because too many files have changed in this diff Show More