summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Nasrat <pnasrat@redhat.com>2006-07-31 15:33:36 +0000
committerPaul Nasrat <pnasrat@redhat.com>2006-07-31 15:33:36 +0000
commita8f7e6dc4e745d4e76ad383b6fada1b8a5771f81 (patch)
tree19dd796a637756f4c74c4cba0553b739ba5dfc12
parent21e0293cb5060285ffbab957727aa354196a9afc (diff)
downloadanaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.tar.gz
anaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.tar.xz
anaconda-a8f7e6dc4e745d4e76ad383b6fada1b8a5771f81.zip
nuke cvs merge line
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 88f5aab8f..cf3fc45b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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