Addressed conflicts

Signed-off-by: Owais Kazi <[email protected]>
opensearch-project · Nov 30, 2023 · cc069de · cc069de
1 parent 16139c1
commit cc069de
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,11 +10,7 @@ on:
 
 jobs:
   spotless:
-<<<<<<< HEAD
     if: github.repository == 'opensearch-project/flow-framework'
-=======
-    if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
->>>>>>> bc6b6a5 (Undo CI changes)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/publish-snapshots.yml b/.github/workflows/publish-snapshots.yml
@@ -12,11 +12,7 @@ jobs:
   build-and-publish-snapshots:
     strategy:
       fail-fast: false
-<<<<<<< HEAD
     if: github.repository == 'opensearch-project/flow-framework'
-=======
-    if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
->>>>>>> bc6b6a5 (Undo CI changes)
     runs-on: ubuntu-latest
 
     permissions:

diff --git a/build.gradle b/build.gradle
@@ -144,7 +144,6 @@ dependencies {
     implementation "org.opensearch:common-utils:${common_utils_version}"
     implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.1'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
-    compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     implementation "com.google.code.gson:gson:2.10.1"
 
     configurations.all {