diff options
| author | Patrick Höhn <hoehnp@gmx.de> | 2018-10-04 17:16:35 +0200 |
|---|---|---|
| committer | Patrick Höhn <hoehnp@gmx.de> | 2018-10-04 17:16:35 +0200 |
| commit | ee89384b908af5c085e9f23025c7a8aa70f06361 (patch) | |
| tree | 50ff4b3482916ecc3bded2ed06ec2abc75eb03e1 | |
| parent | 1907cc142fc41798ffd4958a70af716a31d28202 (diff) | |
| download | navit-ee89384b908af5c085e9f23025c7a8aa70f06361.tar.gz | |
corrected merge conflict as pointed out by @metalstrolch
ändrad: contrib/sailfish/navit-sailfish.spec
| -rwxr-xr-x | contrib/sailfish/navit-sailfish.spec | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index 264f78d6d..11980a77c 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -130,12 +130,9 @@ fi %changelog -<<<<<<< HEAD -======= *Mon Oct 01 2018 metalstrolch 0.5.3-1 - fix rpm updating from 0.5.1 by adding %pre section ->>>>>>> 6389ce56cb6681695734d02b7223ad35b69241e2 *Fri Aug 31 2018 metalstrolch 0.5.3-0 Release 0.5.2 was missing the version number update in the CMakefile. This release fixes this. |