Merge branch 'conflict' ・ 495195e ・ Gitprep

- Merge branch 'conflict';
  
  Conflicts:
  
  conflict.txt
- Browse files
- Yuki Kimoto commited on 2012-03-27
- 2 parents: 80f2c4e + b68ea37
  
  commit 495195e5a9eec6c0126df9017c320f9dc2e5d0ef

Showing 1 changed files with 1 additions and 1 deletions

+1 -1

conflict.txt

...	...	@@ -1,2 +1,2 @@
1	1	aaaa
2		-first
	2	+fixed