version, changelog update

AcademySoftwareFoundation · Jun 1, 2021 · ae6fe7d · ae6fe7d
1 parent b4aeac2
commit ae6fe7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 2.88.4 (2021-06-01)
+[Source](https://github.com/nerdvegas/rez/tree/2.88.4) | [Diff](https://github.com/nerdvegas/rez/compare/2.88.3...2.88.4)
+
+**Merged pull requests:**
+
+- Fix conflict fail graph #865 [\#1087](https://github.com/nerdvegas/rez/pull/1087) ([davidlatwe](https://github.com/davidlatwe))
+
+**Closed issues:**
+
+- fail-graph not showing true root of the conflict [\#865](https://github.com/nerdvegas/rez/issues/865)
+
 ## 2.88.3 (2021-06-01)
 [Source](https://github.com/nerdvegas/rez/tree/2.88.3) | [Diff](https://github.com/nerdvegas/rez/compare/2.88.2...2.88.3)
 

diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py
@@ -1,7 +1,7 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.88.3"
+_rez_version = "2.88.4"
 
 
 # Copyright 2013-2016 Allan Johns.