26c96b6a60
Conflicts: .gitignore sources torque-munge-size.patch torque.spec
6 lines
144 B
Plaintext
6 lines
144 B
Plaintext
<<<<<<< HEAD
|
|
aa033adc22df8ab333e5014dd93754b6 torque-2.5.7.tar.gz
|
|
=======
|
|
3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz
|
|
>>>>>>> master
|