diff options
author | Paul Nasrat <pnasrat@redhat.com> | 2006-07-31 15:33:36 +0000 |
---|---|---|
committer | Paul Nasrat <pnasrat@redhat.com> | 2006-07-31 15:33:36 +0000 |
commit | a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81 (patch) | |
tree | 19dd796a637756f4c74c4cba0553b739ba5dfc12 | |
parent | 21e0293cb5060285ffbab957727aa354196a9afc (diff) | |
download | anaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.tar.gz anaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.tar.xz anaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.zip |
nuke cvs merge line
-rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -28,7 +28,6 @@ * anaconda.spec: reuire newer python-pyblock ->>>>>>> 1.1817 2006-07-28 Jeremy Katz <katzj@redhat.com> * users.py (Users.createUser): Create users under the rootpath |