resolving some file differences

[feisty_meow.git] / .dev_bran

diff --git a/.dev_bran b/.dev_bran
index e91d326b69344ca2ef7b29202015adbc8113f82b..4d131f2a8a887ac08bb4fec9e2b67e6a87aeb761 100644 (file)
--- a/.dev_bran
+++ b/.dev_bran
@@ -1,2 +1,2 @@
 
-tickling a check-in
+should be removed