removed remnants of merge

README.md

@@ -11,21 +11,15 @@ The MATLAB® Engine API for Python® provides a package to integrate MATLA
 ### Required 3rd Party Products
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 * Python 3.8, 3.9, or 3.10
-<<<<<<< HEAD
     * Supported Python versions by MATLAB release can be found [here](https://mathworks.com/support/requirements/python-compatibility.html).
-=======
-    * Supported Python versions by MATLAB release can be found [here](https://www.mathworks.com/support/requirements/python-compatibility.html).
->>>>>>> 6fbf1c78f02910e71ce14f3a49f20a634f653509
-
----
 
 ## Install
 
 ### Windows
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.14.5
+$ python -m pip install matlabengine==9.14.6
 ```
 
 
@@ -50,7 +44,7 @@ setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:<matlabroot>/bin/glnxa64
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.14.5
+$ python -m pip install matlabengine==9.14.6
 ```
 
 ### macOS
@@ -74,7 +68,7 @@ setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:<matlabroot>/bin/maci64
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.14.5
+$ python -m pip install matlabengine==9.14.6
 ```
 
 ---

setup.py

@@ -24,7 +24,7 @@ class _MatlabFinder(build_py):
     MATLAB_REL = 'R2023a'
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-    MATLAB_VER = '9.14.5'
+    MATLAB_VER = '9.14.6'
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
     SUPPORTED_PYTHON_VERSIONS = set(['3.8', '3.9', '3.10'])
@@ -414,7 +414,7 @@ def run(self):
     setup(
         name="matlabengine",
         # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-        version="9.14.5",
+        version="9.14.6",
         description='A module to call MATLAB from Python',
         author='MathWorks',
         license="LICENSE.txt, located in this repository",