frontend resolve conflicts
This commit is contained in:
parent
75b4785f5c
commit
373431f0d0
1 changed files with 1 additions and 3 deletions
|
@ -16,8 +16,6 @@
|
||||||
</FormField>
|
</FormField>
|
||||||
<Button type="submit" severity="secondary" label="Submit" />
|
<Button type="submit" severity="secondary" label="Submit" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</Form>
|
</Form>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<Checkbox v-model="remember" inputId="rememberme" binary/>
|
<Checkbox v-model="remember" inputId="rememberme" binary/>
|
||||||
|
@ -58,7 +56,7 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@media (min-width: 1024px) {
|
@media (min-width: 1024px) {
|
||||||
.about {
|
.about {
|
||||||
|
|
Loading…
Add table
Reference in a new issue