fixed merge conflicts

This commit is contained in:
KiranMantha 2021-12-31 14:58:26 +05:30
parent 8ee5d2494b
commit fe92c59e2d
10 changed files with 10 additions and 10 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
css/pico.min.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -17,7 +17,7 @@
&lt;<b>/details</b>&gt; &lt;<b>/details</b>&gt;
<em>&lt;!-- For Multi-select --&gt;</em>\ <em>&lt;!-- For Multi-select --&gt;</em>
&lt;<b>details role="list"</b>&gt; &lt;<b>details role="list"</b>&gt;
&lt;<b>summary aria-haspopup="listbox"</b>&gt;Multi select&lt;<b>/summary</b>&gt; &lt;<b>summary aria-haspopup="listbox"</b>&gt;Multi select&lt;<b>/summary</b>&gt;
&lt;<b>ul role="listbox"</b>&gt; &lt;<b>ul role="listbox"</b>&gt;