Max
7 lines
69 B
Plaintext
7 lines
69 B
Plaintext
<<<<<<< HEAD
|
|
**/bin/
|
|
**/*.kdev4
|
|
=======
|
|
**/.git/
|
|
>>>>>>> 04d78ae (.)
|