Skip to content

Commit 2ecb0d1

Browse files
committed
Merge branch 'radio_button_vika'
# Conflicts: # images/ui/radiobutton/01_Radio Button.png # images/ui/radiobutton/01_Radio Button_dark.png # images/ui/radiobutton/02_When_to_use_correct.png # images/ui/radiobutton/02_When_to_use_correct_dark.png # images/ui/radiobutton/02_When_to_use_incorrect.png # images/ui/radiobutton/02_When_to_use_incorrect_dark.png # images/ui/radiobutton/03_When_to_use_Segmented_button.png # images/ui/radiobutton/03_When_to_use_Segmented_button_dark.png # images/ui/radiobutton/04_When_to_use_correct.png # images/ui/radiobutton/04_When_to_use_correct_dark.png # images/ui/radiobutton/04_When_to_use_incorrect.png # images/ui/radiobutton/04_When_to_use_incorrect_dark.png # images/ui/radiobutton/05_When_to_use_Segmented_button.png # images/ui/radiobutton/05_When_to_use_Segmented_button_dark.png # images/ui/radiobutton/06_How_to_use.png # images/ui/radiobutton/06_How_to_use_dark.png # images/ui/radiobutton/07_How_to_use.png # images/ui/radiobutton/07_How_to_use_dark.png # images/ui/radiobutton/08_How_to_use_correct.png # images/ui/radiobutton/08_How_to_use_correct_dark.png # images/ui/radiobutton/08_How_to_use_incorrect.png # images/ui/radiobutton/08_How_to_use_incorrect_dark.png # images/ui/radiobutton/09_How_to_use.png # images/ui/radiobutton/09_How_to_use_dark.png # images/ui/radiobutton/old/answeryes_correct.png # images/ui/radiobutton/old/radio-macos.png # images/ui/radiobutton/old/twoline_label.png # topics/ui/controls/radio_button.md
2 parents 04bd6e5 + 7ea689a commit 2ecb0d1

32 files changed

+68
-59
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
2.24 KB
Loading
2.32 KB
Loading
7 Bytes
Loading
33 Bytes
Loading
-131 Bytes
Loading
50 Bytes
Loading
4.39 KB
Loading
5.93 KB
Loading

0 commit comments

Comments
 (0)