#84 - merge conflict resolution

zendframework · Jan 25, 2016 · 292f36f · 292f36f
1 parent 897d016
commit 292f36f
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,24 +39,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 3.0.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 3.0.2 - 2016-01-24
 
 ### Added