11 lines
127 B
Text
11 lines
127 B
Text
*.d
|
|
*.o
|
|
Release/*
|
|
<<<<<<< HEAD
|
|
!Release/RepRapFirmware.bin
|
|
=======
|
|
!Release/RepRapFirmware*.bin
|
|
>>>>>>> duet
|
|
*~
|
|
*orig
|
|
/Release
|