Fix issues

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Oct 4, 2022 · 380dffb · 380dffb
1 parent 1d1a8fc
commit 380dffb
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/manifests/1.3.6/opensearch-1.3.6.yml b/manifests/1.3.6/opensearch-1.3.6.yml
@@ -87,17 +87,6 @@ components:
     platforms:
       - linux
       - windows
-<<<<<<< HEAD
-  - name: sql
-    repository: https://github.com/opensearch-project/sql.git
-    ref: '2.x'
-    platforms:
-      - linux
-      - windows
-    checks:
-      - gradle:properties:version
-      - gradle:dependencies:opensearch.version: opensearch-sql-plugin
-=======
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
     ref: '1.3'