13 lines
250 B
Plaintext
13 lines
250 B
Plaintext
<<<<<<< HEAD
|
|
[Project]
|
|
CreatedFrom=CMakeLists.txt
|
|
Manager=KDevCMakeManager
|
|
Name=BeagleRescue
|
|
||||||| 8aa7974
|
|
=======
|
|
[Project]
|
|
CreatedFrom=CMakeLists.txt
|
|
Manager=KDevCMakeManager
|
|
Name=BeagleRescue.git
|
|
>>>>>>> a3d13f32a5f0e4e11c618a4c3d524fd52fc0ed08
|