CHANGELOG.txt in autotest-growl-0.2.6 vs CHANGELOG.txt in autotest-growl-0.2.8
- old
+ new
@@ -1,4 +1,18 @@
+<<<<<<< HEAD
+== 0.2.8 2010-12-02
+
+* 2 minor improvements
+ * Update README due to autotest naming disagreement
+ * Switch from Jeweler to Bundler for development
+
+=======
+>>>>>>> 33b9db1484f1570710104e933ae1f79e5492be18
+== 0.2.7 2010-10-29
+
+* 1 minor improvement
+ * Fix image path for cygwin (Patrick Aikens)
+
== 0.2.6 2010-09-24
* 1 minor improvement
* Accept cygwin as host_os