PSAAS-21305 | merge conflicts resolved

splunk-soar-connectors · Jan 13, 2025 · 8f7ee9f · 8f7ee9f
2 parents c973581 + a9bca98
commit 8f7ee9f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
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/README.md b/README.md
@@ -94,4 +94,4 @@ This table lists the configuration variables required to operate REST Data Sourc
 VARIABLE | REQUIRED | TYPE | DESCRIPTION
 -------- | -------- | ---- | -----------
 **parse_script** |  optional  | file | Custom Python REST handler
-**stock_scripts** |  optional  | string | Preconfigured parsing scripts
+**stock_scripts** |  optional  | string | Preconfigured parsing scripts
diff --git a/rest_ingest.json b/rest_ingest.json
@@ -121,4 +121,4 @@
             }
         ]
     }
-}
+}
diff --git a/wheels/py36/lxml-5.3.0-cp36-cp36m-manylinux_2_28_x86_64.whl b/wheels/py36/lxml-5.3.0-cp36-cp36m-manylinux_2_28_x86_64.whl
diff --git a/wheels/py39/lxml-5.3.0-cp39-cp39-manylinux_2_28_x86_64.whl b/wheels/py39/lxml-5.3.0-cp39-cp39-manylinux_2_28_x86_64.whl
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,4 +121,4 @@ @@
                 }
             ]
         }
-    }
+    }