16 lines
237 B
Text
16 lines
237 B
Text
.direnv
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
||||||| parent of 2ccfcd1 (fixup flake)
|
|
testgit
|
|
*.swp
|
|
=======
|
|
testgit
|
|
*.swp
|
|
result
|
|
>>>>>>> 2ccfcd1 (fixup flake)
|
|
||||||| parent of 056d53e (port to go)
|
|
=======
|
|
testgit
|
|
*.swp
|
|
>>>>>>> 056d53e (port to go)
|