From 9e2292140ce9a93c52230ecf5481d7f0e86814cd Mon Sep 17 00:00:00 2001 From: karthikMangineni Date: Mon, 23 Sep 2024 21:44:55 -0500 Subject: [PATCH] no merge conflicts were encountered --- .github/workflows/Native.yml | 2 +- __tests__/__snapshots__/SetTime.test.tsx.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Native.yml b/.github/workflows/Native.yml index a76b297..6e02ac8 100644 --- a/.github/workflows/Native.yml +++ b/.github/workflows/Native.yml @@ -2,7 +2,7 @@ name: App test on: push: - branches: [ main,Home-screen-navigation-issue ] + branches: [ main,Home-screen-navigation-issue, 161-search-published-entries ] pull_request: branches: [ main ] diff --git a/__tests__/__snapshots__/SetTime.test.tsx.snap b/__tests__/__snapshots__/SetTime.test.tsx.snap index 2021bac..f096138 100644 --- a/__tests__/__snapshots__/SetTime.test.tsx.snap +++ b/__tests__/__snapshots__/SetTime.test.tsx.snap @@ -38,8 +38,8 @@ exports[`LocationWindow renders without crashing 1`] = ` } } > - 9/18/2024 -05:01 PM + 9/23/2024 +09:39 PM