remove a conflict marker
This commit is contained in:
parent
87b954fc29
commit
dc78af3e04
1
gdm.spec
1
gdm.spec
@ -368,7 +368,6 @@ fi
|
|||||||
- remove dwellmouselistener module from default configuration.
|
- remove dwellmouselistener module from default configuration.
|
||||||
It's pretty broken (bug 248752)
|
It's pretty broken (bug 248752)
|
||||||
|
|
||||||
>>>>>>> 1.266
|
|
||||||
* Fri Aug 3 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.19.5-2
|
* Fri Aug 3 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.19.5-2
|
||||||
- Update license field
|
- Update license field
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user