Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Credential Registry testcases, help page new test cases added , MOSIP-30054 MOSIP-30230 MOSIP-30282 #1024

Merged
merged 7 commits into from
Nov 21, 2023

Conversation

anup-nehe
Copy link
Contributor

https://mosip.atlassian.net/browse/MOSIP-30282
https://mosip.atlassian.net/browse/MOSIP-30054
https://mosip.atlassian.net/browse/MOSIP-30230
added new test cases:
-Credential Registry testcases.
-valid context in the help page.
-accessing help page in offline.
-scrolling the help page.
-deleteDownloadedVcInOfflineMode.

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
return this;
}

public String CheckEnvNotChanged() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

return new PleaseConfirmPopupPage(driver);
}

public boolean isQRCodeDisplayed() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

@@ -14,6 +14,9 @@ public class HassleFreeAuthenticationPage extends BasePage {
@AndroidFindBy(xpath = "(//*[@class='android.widget.TextView'])[3]")
@iOSXCUITFindBy(xpath = "//*[contains(@value,'Authenticate yourself')]")
private WebElement hassleFreeAuthenticationDescription;

@AndroidFindBy(xpath = "//*[contains(@text,'Go Back')]")
public WebElement GoBackButton;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

@iOSXCUITFindBy(iOSClassChain ="**/XCUIElementTypeOther[`label == \"\uE5CD\"`][1]")
private WebElement CloseButton;

@AndroidFindBy(uiAutomator = "new UiSelector().textContains(\"Something is wrong. Please try again later!\")")
public WebElement SomthingIsWrongPopup;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

@@ -27,10 +27,13 @@ public class MoreOptionsPage extends BasePage {
@iOSXCUITFindBy(accessibility = "profileAuthenticated")
private WebElement activatedForOnlineLoginButton;

@AndroidFindBy(xpath = "//*[@resource-id=\"iconIcon\"]")
@AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"iconIcon\")")
@iOSXCUITFindBy(iOSClassChain ="**/XCUIElementTypeOther[`label == \"\uE5CD\"`][1]")
private WebElement CloseButton;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

@@ -52,6 +52,21 @@ public class SettingsPage extends BasePage {
@iOSXCUITFindBy(accessibility = "injiTourGuide")
private WebElement receivedCards;

@AndroidFindBy(xpath = "//*[contains(@text,'Credential Registry')]")
public WebElement clickOnCredentialRegistry;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename locator to credentialRegistryText

public WebElement clickOnCredentialRegistry;

@AndroidFindBy(xpath = "//*[contains(@text,'Receive Card')]")
public WebElement clickOnReceiveCard;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename locator

public WebElement clickOnReceiveCard;

@AndroidFindBy(xpath = "//*[contains(@text,'Tumanggap ng Card')]")
public WebElement clickOnReceiveCardInfilipinoLanguage;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename locator

assertTrue(aboutInjiPage.isAppidIsCopied(),"verify if app id is copied");

aboutInjiPage.clickOnBack();
assertTrue(aboutInjiPage.isCopyTextDisplayed(),"verify if app id is copy");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change assert message

}

@Test
public void GenerateUinOrVidInNewEnv() throws InterruptedException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing and change method name to generate Uin instead if UIN and VID both

assertTrue(generateUinOrVidPage.isGenerateUinOrVidPageLoaded(), "Verify if generate uin or vid page page is displayed");
OtpVerificationPage otpVerification = generateUinOrVidPage.enterApplicationID(TestDataReader.readData("aid")).clickOnGetUinOrVidButton();

assertTrue(retrieveIdPage.isAidIsNotReadyYetErrorDisplayed(), "Verify if aid is not ready displayed");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review and fix assert for UIN verification

}

@Test
public void DownloadCardWithoutInternetRetryWithInternet() throws InterruptedException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camel casing

assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");

CommonMethods.disableAirplaneMode();
assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create new method isTryAgainButtonNotDisplayed()


CommonMethods.disableAirplaneMode();
assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
Thread.sleep(3000);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove static wait

assertTrue(homePage.isTryAgainButtonDisplayed(), "Verify if Try again button displayed");
Thread.sleep(3000);

homePage.clickOnTryAgainbutton();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Camel casing

public class ReceiveCardTest extends BaseTest {

@Test
public void verifyRecivedCard() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changeMethodName

}

@Test
public void verifyRecivedCardInFilipinoLanguage() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename method name

@@ -134,4 +134,34 @@ public void verifyInvalidVidErrorMessage() {
assertTrue(retrieveIdPage.isIncorrectInputFormatErrorMessageDisplayed());
}

}
@Test
public void downloadAndVerifyVcUsingRevokevid() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

camelCasing

ProcessBuilder processBuilderOtherOS = new ProcessBuilder("/bin/bash\", \"-c\", \"adb shell cmd connectivity airplane-mode disable");
processBuilderOtherOS.redirectErrorStream(true);
processBuilderOtherOS.start();
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove duplicate code

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
@anup-nehe anup-nehe changed the title Credential Registry testcases, help page testcases, MOSIP-30054 MOSIP-30230 MOSIP-30282 Credential Registry testcases, help page testcases added new test cases, MOSIP-30054 MOSIP-30230 MOSIP-30282 Nov 21, 2023
@anup-nehe anup-nehe changed the title Credential Registry testcases, help page testcases added new test cases, MOSIP-30054 MOSIP-30230 MOSIP-30282 Credential Registry testcases, help page new test cases added , MOSIP-30054 MOSIP-30230 MOSIP-30282 Nov 21, 2023
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
@swatigoel swatigoel merged commit 76a0948 into mosip:develop Nov 21, 2023
PuBHARGAVI pushed a commit to tw-mosip/inji-wallet that referenced this pull request Nov 21, 2023
…-30054 MOSIP-30230 MOSIP-30282 (mosip#1024)

* MOSIP-30054 MOSIP-30230 MOSIP-30282

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

---------

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>
srikanth716 pushed a commit to tw-mosip/inji-wallet that referenced this pull request Nov 23, 2023
…-30054 MOSIP-30230 MOSIP-30282 (mosip#1024)

* MOSIP-30054 MOSIP-30230 MOSIP-30282

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

---------

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
swatigoel pushed a commit that referenced this pull request Nov 30, 2023
* feat(INJI-474): show popup for invalid QR (#999)

* feat(INJI-474): show popup for invalid QR

* at times a scanned QR code is neither online nor offline

Co-authored-by: adityankannan-tw <109274996+adityankannan-tw@users.noreply.github.com>
Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* refactor(INJI-474): add a dismiss-able popup w buttons

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* feat(INJI-474): use polyfill for URL searchParams feat

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* feat(INJI-474): move popup buttons to a single row

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* refactor(INJI-474): align buttons in popup

Co-authored-by: Anil kumar M <106086523+Anil-kumar-Majji@users.noreply.github.com>
Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* feat(INJI-474): don't show Loader on invalidQR & fix QR type logic

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

* refactor(INJI-474): propagate btn style changes to Themes

Co-authored-by: Vijay <94220135+vijay151096@users.noreply.github.com>
Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>

---------

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>
Co-authored-by: Harsh Vardhan <harsh59v@gmail.com>
Co-authored-by: Anil kumar M <106086523+Anil-kumar-Majji@users.noreply.github.com>
Co-authored-by: Vijay <94220135+vijay151096@users.noreply.github.com>

* Fix: (Inji-261): Most of the elements which are still in orange in the purple theme are fixed. (#1021)

* Feat(INJI-261): Some elements still appearing orange colour in the purple theme

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

* FIX(INJI-261): Some elements still appearing orange colour in the purple theme

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

* FIX(INJI-261): Fixed the home screen icons to purple theme

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

* FIX(INJI-261): Fixed the comments of respective PR

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

* FIX(INJI-261): Fixed the comments of respective PR

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

---------

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>

* MOSIP-30340 | Regression test for IOS added (#1023)

* Test script updated for new apk

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added from master sheet

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* Test cases added from regression sheet

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* automated ios tests for regression

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* conflict resolved

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

---------

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* Credential Registry testcases, help page new test cases added , MOSIP-30054 MOSIP-30230 MOSIP-30282 (#1024)

* MOSIP-30054 MOSIP-30230 MOSIP-30282

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

---------

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* fix(INJI-536):check status failed while downloading vc (#1032)

Signed-off-by: Sri Kanth Kola <srikanthsri7447@gmail.com>

* refactor(INJI-449): replace crypto-js with node-forge for encryption/decryption (#1034)

* refactor(INJI-449): replace crypo-js with node-forge

crypto-js has vulneraribitiles prior to version 4.2.0 for encryption / decryption & 4.x.x version is not compatible with our react native project For this reason we had to move to different library for encryption / decryption

Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com>
Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* fix(INJI-449): secure-keystore warning popup shown on reload of app

settings key which was stored in storage was not loaded into settings machine context correctly, which caused the bug - on reload settings related flows was falling back to initial setting.

Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com>

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): gitignore automation test results

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): simplify usage of methods in node-forge

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

---------

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>
Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com>

* refactor(INJI-449): fix OWASP vulnerabilities with dependencies (#1035)

* refactor(INJI-449): remove unused dependencies

Dependencies removed

1. expo-status-bar
2. @expo-google-fonts/poppins
3. react-native-simple-markdown
4. react-native-swipe-gestures

DevDependencies removed

1. @react-native/metro-config (removed as we already have @expo/metro-config dependency used)
2. metro-react-native-babel-preset
3. @types/react-test-renderer
4. react-test-renderer

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): update expo related packages and crypto-js

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): update transitive dependency of expo-updates package

plist package is a transitive dependency of expo-updates which had vulnerability - Prototype pollution vulnerability via .parse() in Plist before v3.0.4 allows attackers to cause a Denial of Service (DoS) and may lead to remote code execution. Thus this package was updated to fix vulnerability

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): update axios dependency of telemetry-sdk to 1.6.0

Since the package axios(1.5.0) has vulnerability - Cross-Site Request Forgery (CSRF), it is updated to 1.6.0

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* fix(INJI-449): vulnerablity issue with @digitalbazaar/rsa-verification-key-2018

override the node-forge dependency of the package - @digitalbazaar/rsa-verification-key-2018 as it has the high severity with CVE count 13

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* revert(INJI-449): downgrade crypto-js to 3.3.0 from 4.x.x version

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): use expo-splash-screen instead of expo-app-loading

expo-app-loading package is deprecated and it is suggested to replace it with expo-splash-screen

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): optimize time taken to hide splash screen

Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com>

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): change appEntry to index js

Change appEntry to index.js file since react-native-url-polyfill/auto is imported to avoid URL error. appEntry is required for expo package update

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-559): update podfile.lock

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* refactor(INJI-449): optimize import

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

---------

Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>

* feat(INJI-541): for sonar qube generate dummy release keystore file in build.gradle

Signed-off-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>

* fix(INJI-541): pass sonar args as input variable in internal build yml file

Signed-off-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>

* fix(INJI-541): use dummy alias and password for dummyrelease keystore

Signed-off-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>

* MOSIP-30369 | Framework structure change to support device farm execution (#1039)

* Test script updated for new apk

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added from master sheet

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* Test cases added from regression sheet

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* new test cases added

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* automated ios tests for regression

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* conflict resolved

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* framework optimization

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* folder structure changed

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* framework restructure for device farm

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* incorporated review comments

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

---------

Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>

* fix(INJI-541): comment sonarqube check

Signed-off-by: adityankannan-tw <adityan410pm@gmail.com>

* fix(INJI-541): use correct env variable name for slack webhook url

Signed-off-by: adityankannan-tw <adityan410pm@gmail.com>

---------

Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>
Signed-off-by: anil_majji <majjianilkumar050@gmail.com>
Signed-off-by: kamalsingh <kamal.singh@thoughtworks.com>
Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Sri Kanth Kola <srikanthsri7447@gmail.com>
Signed-off-by: Kiruthika Jeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>
Signed-off-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>
Signed-off-by: adityankannan-tw <adityan410pm@gmail.com>
Co-authored-by: Harsh Vardhan <harsh59v@gmail.com>
Co-authored-by: Anil kumar M <106086523+Anil-kumar-Majji@users.noreply.github.com>
Co-authored-by: Vijay <94220135+vijay151096@users.noreply.github.com>
Co-authored-by: kamalsinghthoughtworks <120381388+kamalsinghthoughtworks@users.noreply.github.com>
Co-authored-by: anup-nehe <117707464+anup-nehe@users.noreply.github.com>
Co-authored-by: srikanth716 <97477121+srikanth716@users.noreply.github.com>
Co-authored-by: KiruthikaJeyashankar <81218987+KiruthikaJeyashankar@users.noreply.github.com>
Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com>
Co-authored-by: PuBHARGAVI <46226958+PuBHARGAVI@users.noreply.github.com>
Co-authored-by: adityankannan-tw <adityan410pm@gmail.com>
vharsh pushed a commit to tw-mosip/inji-wallet that referenced this pull request Dec 1, 2023
…-30054 MOSIP-30230 MOSIP-30282 (mosip#1024)

* MOSIP-30054 MOSIP-30230 MOSIP-30282

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

* resolve conflict

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

---------

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
Signed-off-by: Harsh Vardhan <harsh59v@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants