test merge conf

1 year ago · afd7076106
parent 5fbf00fa11
commit afd7076106
1 changed files with 2 additions and 0 deletions
--- a/test.txt
+++ b/test.txt
@ -1,3 +1,5 @@
 I've added this new thing
 a new addition
 a third line