Merge pull request SyneRBI#91 from CCPPETMR/rel111

updated CHANGES.md
paskino · Jun 6, 2018 · 5c786a5 · 5c786a5
2 parents 7611f33 + 93139c2
commit 5c786a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,7 @@
 # ChangeLog
 
 ## 1.1.1
-- no change. 
+- added nbstripout (https://github.com/kynan/nbstripout) to handle conflicts in SIRF-Exercises
 
 ## 1.1.0
 - added pip, firefox