changes, remove unnecessary conflict

mirage · Oct 30, 2019 · adef0f8 · adef0f8
1 parent c066a90
commit adef0f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+### v2.2.0 (2019-10-30)
+
+* Adapt to mirage-net 3.0.0 and mirage-protocols 4.0.0 changes (#6 @hannesm)
+
 ### v2.1.0 (2019-07-15)
 
 * Use ipaddr.4.0.0 interfaces (#5 @avsm)

diff --git a/ethernet.opam b/ethernet.opam
@@ -31,9 +31,6 @@ depends: [
   "lwt" {>= "3.0.0"}
   "logs" {>= "0.6.0"}
 ]
-conflicts: [
-  "tcpip" {< "3.7.0"}
-]
 synopsis: "OCaml Ethernet (IEEE 802.3) layer, used in MirageOS"
 description: """
 `ethernet` provides an [Ethernet](https://en.wikipedia.org/wiki/Ethernet)