From dbb18b292cfa14444d2e6d15202b9dcf5ab8365e Mon Sep 17 00:00:00 2001
From: SpacePossum <possumfromspace@gmail.com>
Date: Wed, 24 Jan 2018 19:03:59 +0100
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 302968a..17822a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 This file contains the changelogs of the package.
 
+### Changelog for v3.1
+###### Jan 24, 2018
+
+- add missing conflict with PHPUnit in composer.json
+
 ### Changelog for v3.0
 ###### Aug 23, 2017