Idrees Jawadwala f7f3d87dcc fix conflicts

2022-04-28 22:04:51 +05:30

..

login_themes.iml

amalati theme added

2022-04-28 17:12:48 +05:30

markdown.xml

amalati theme added

2022-04-28 17:12:48 +05:30

modules.xml

amalati theme added

2022-04-28 17:12:48 +05:30

vcs.xml

amalati theme added

2022-04-28 17:12:48 +05:30

workspace.xml

fix conflicts

2022-04-28 22:04:51 +05:30