Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Anup Nehe <[email protected]>
  • Loading branch information
anup-nehe committed Jan 2, 2025
1 parent 313ea44 commit 4dfac04
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions api-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@

<dependencies>
<dependency>
<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
<groupId>io.mosip.testrig.apitest.commons</groupId>
<artifactId>apitest-commons</artifactId>
<version>1.2.2-SNAPSHOT</version>
<version>1.3.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0",
"requestTime": "{{requesttime}}",
"metadata": {},
"deviceId": "{{deviceId}}",
"request": {
"deviceId": "{{deviceId}}",
"status": "De-Activate"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"deviceId": "{{deviceId}}",
"metadata": {},
"request": {
"deviceId": "{{deviceId}}",
"status": "De-Activate"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0",
"requestTime": "{{requestTime}}",
"metadata": {},
"ftmId": "{{ftmId}}",
"request": {
"ftmId": "{{ftmId}}",
"status": "De-Activate"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "{{version}}",
"requestTime": "{{requestTime}}",
"metadata": {},
"ftmId": "{{ftmId}}",
"request": {
"ftmId": "{{ftmId}}",
"status": "De-Activate"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0",
"requestTime": "{{requesttime}}",
"metadata": {},
"sbiId": "{{sbiId}}",
"request": {
"sbiId": "{{sbiId}}",
"status": "De-Activate"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "{{version}}",
"requestTime": "{{requesttime}}",
"metadata": {},
"sbiId": "{{sbiId}}",
"request": {
"sbiId": "{{sbiId}}",
"status": "De-Activate"
}
}

0 comments on commit 4dfac04

Please sign in to comment.