resolve conflicts

Signed-off-by: Anup Nehe <[email protected]>
mosip · Oct 16, 2024 · a4526a6 · a4526a6
1 parent d5b423e
commit a4526a6
Show file tree

Hide file tree

Showing 96 changed files with 0 additions and 0 deletions.
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728381792708.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728381792708.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728381877035.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728381877035.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728531712951.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728531712951.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728531840266.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728531840266.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728531998962.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728531998962.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728532398830.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728532398830.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728532482397.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728532482397.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728532533715.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728532533715.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728535671283.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728535671283.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728535891061.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728535891061.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728536169430.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728536169430.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728540725737.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728540725737.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728541606933.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728541606933.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728879342795.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728879342795.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728881146230.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728881146230.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728881340209.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728881340209.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728965814342.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728965814342.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728967459308.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728967459308.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728967619606.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728967619606.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728967959283.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728967959283.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1728969386839.png b/uitest-pmprevamp/src/main/resources/Screenshots/1728969386839.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051062284.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051062284.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051277147.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051277147.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051368970.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051368970.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051461282.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051461282.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051495886.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051495886.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729051625848.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729051625848.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729052688208.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729052688208.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729052784308.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729052784308.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729052879234.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729052879234.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729052974010.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729052974010.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729053035335.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729053035335.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729053166072.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729053166072.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729053809340.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729053809340.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729053999906.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729053999906.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729054060776.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729054060776.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729054120427.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729054120427.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729054147546.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729054147546.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729054281230.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729054281230.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729055616408.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729055616408.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729055892345.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729055892345.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729055917635.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729055917635.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729055944684.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729055944684.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729056246387.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729056246387.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729056570057.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729056570057.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729058315517.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729058315517.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729058376049.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729058376049.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729058436533.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729058436533.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729058458586.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729058458586.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729058574366.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729058574366.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729059583372.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729059583372.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729059757278.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729059757278.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729059817441.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729059817441.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729059838883.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729059838883.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729060206687.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729060206687.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729060458930.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729060458930.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729060519419.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729060519419.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729060540925.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729060540925.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729060653758.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729060653758.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729062305764.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729062305764.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729062473186.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729062473186.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729062533376.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729062533376.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729062554845.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729062554845.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729062666815.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729062666815.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729063886200.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729063886200.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729064065323.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729064065323.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729064149528.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729064149528.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729064172171.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729064172171.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729064289210.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729064289210.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729065613960.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729065613960.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729066315820.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729066315820.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729066401718.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729066401718.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729066424942.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729066424942.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729066544365.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729066544365.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729067422068.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729067422068.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729067508080.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729067508080.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729067533592.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729067533592.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729068675221.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729068675221.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729068826502.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729068826502.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729068898231.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729068898231.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729069038736.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729069038736.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729069088776.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729069088776.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729069625531.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729069625531.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729069793566.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729069793566.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729070365834.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729070365834.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729070481483.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729070481483.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729070536775.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729070536775.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729071718623.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729071718623.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729071876887.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729071876887.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729074238819.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729074238819.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729074456359.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729074456359.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729075859418.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729075859418.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729076013514.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729076013514.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729078181908.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729078181908.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729078242360.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729078242360.png
diff --git a/uitest-pmprevamp/src/main/resources/Screenshots/1729080206662.png b/uitest-pmprevamp/src/main/resources/Screenshots/1729080206662.png