squashed commit

This commit is contained in:
didier amyot committed 2016-01-25 14:07:55 -05:00
1 parent e9ec370227
commit 90103f7b7a
1 file changed
+4
+4
View File
@@ -8,3 +8,7 @@ In branch 1 too
In master In master
In branch 2 In branch 2
hjdssdi
saksd sdjhjksd