From da55727b2f3f0617db0803041da6b5305cc214b1 Mon Sep 17 00:00:00 2001
From: Alan Grossfield <alan_grossfield@urmc.rochester.edu>
Date: Sat, 8 Aug 2020 18:02:23 -0400
Subject: [PATCH] updatery

---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f2ecf4ae5..069d54bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2020-08-08  Alan Grossfield <alan>
+	* Merged conda-install branch into main: this will be LOOS 3.2
+	* fixed missing exception catching in python parseRangeList
+	
 2020-08-06  Alan Grossfield <alan>
 	* Merged in rna_suites tool and library from Chapin Cavender
-	
+
 2020-08-05  Alan Grossfield <alan>
 	* Merged in dihedrals tool from Louis Smith