6 lines
95 B
Plaintext
6 lines
95 B
Plaintext
<<<<<<< HEAD
|
|
2.10
|
|
=======
|
|
2.9
|
|
>>>>>>> 02981fa... add pkglist and template for fedora21 ppc64le
|