fix: Handle Unset Enums when deserializing (openapi-generators#306)

Author: bowenwr

CHANGELOG.md

@@ -13,7 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `setup` will generate a pyproject.toml with no Poetry information, and instead create a `setup.py` with the 
     project info.
   - `none` will not create a project folder at all, only the inner package folder (which won't be inner anymore)
+<<<<<<< HEAD
 - Lowered the minimum version of `python-dateutil` for improved dependency compatibility with other projects
+=======
+- Attempt to detect and alert users if they are using an unsupported version of OpenAPI (#281).
+- Fixes `Enum` deserialization when the value is `UNSET`.
+
+### Changes
+>>>>>>> aa6972c... fix: Handle Unset Enums when deserializing (#306)
 
 
 ## 0.7.3 - 2020-12-21