Merge pull request #11 from splunk-soar-connectors/resolving_conflicts

Resolving conflicts
splunk-soar-connectors · Dec 23, 2024 · b942f18 · b942f18
2 parents 16fd321 + 7a4a6a3
commit b942f18
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,6 @@ repos:
     hooks:
     -   id: org-hook
     -   id: package-app-dependencies
-    -   id: readme-check
 -   repo: https://github.com/Yelp/detect-secrets
     rev: v1.5.0
     hooks:

diff --git a/LICENSE b/LICENSE
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
diff --git a/awssts.json b/awssts.json
@@ -363,4 +363,4 @@
             "versions": "EQ(*)"
         }
     ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -363,4 +363,4 @@ @@
                 "versions": "EQ(*)"
             }
         ]
-    }
+    }