save conflict
This commit is contained in:
parent
8ffacb60d3
commit
d653ac9eee
|
|
@ -35,11 +35,7 @@ const AreaCoverageWorkUnits = () => {
|
||||||
<p className="text-base font-bold">Polda Jajaran</p>
|
<p className="text-base font-bold">Polda Jajaran</p>
|
||||||
</button>
|
</button>
|
||||||
</DialogTrigger>
|
</DialogTrigger>
|
||||||
<<<<<<< HEAD
|
|
||||||
<DialogContent size="md" className="max-h-[90vh] overflow-y-auto flex flex-col ">
|
|
||||||
=======
|
|
||||||
<DialogContent size="md" className="max-h-[90vh] overflow-hidden flex flex-col" data-lenis-prevent>
|
<DialogContent size="md" className="max-h-[90vh] overflow-hidden flex flex-col" data-lenis-prevent>
|
||||||
>>>>>>> d7747da00bb99fa3931b64558555cf22f624ccd5
|
|
||||||
<DialogHeader className="flex flex-col justify-center">
|
<DialogHeader className="flex flex-col justify-center">
|
||||||
<DialogTitle>
|
<DialogTitle>
|
||||||
<p className="text-center">Polda Jajaran</p>
|
<p className="text-center">Polda Jajaran</p>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue