From 7e1ff812b7c23cbbb45ff03a7796df9c5621c9f6 Mon Sep 17 00:00:00 2001
From: Omry Yadan <omry@fb.com>
Date: Tue, 3 Nov 2020 15:57:50 -0800
Subject: [PATCH] release 2.0.4 (#429)

---
 NEWS.md              | 8 ++++++++
 news/428.bugfix      | 1 -
 omegaconf/version.py | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 news/428.bugfix

diff --git a/NEWS.md b/NEWS.md
index ec8efe92a..08edf57a0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,11 @@
+## 2.0.4 (2020-11-03)
+
+
+### Bug Fixes
+
+- Fix a bug merging into a field annotated as Optional[List[int]] = None ([#428](https://github.com/omry/omegaconf/issues/428))
+
+
 ## 2.0.3 (2020-10-19)
 
 
diff --git a/news/428.bugfix b/news/428.bugfix
deleted file mode 100644
index 1fde3a4fe..000000000
--- a/news/428.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug merging into a field annotated as Optional[List[int]] = None
diff --git a/omegaconf/version.py b/omegaconf/version.py
index b80e75efc..5982c6a41 100644
--- a/omegaconf/version.py
+++ b/omegaconf/version.py
@@ -1,6 +1,6 @@
 import sys  # pragma: no cover
 
-__version__ = "2.0.3"
+__version__ = "2.0.4"
 
 msg = """OmegaConf 2.0 and above is compatible with Python 3.6 and newer.
 You have the following options: