Skip to content

fix setup.cfg merge issues #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JustinAzoff wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix setup.cfg merge issues #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ provides = rhnapi
requires = python

changelog =
<<<<<<< HEAD
=======
* Mon Nov 26 2012 Stuart Sears <stuart.sears@man.com> 5.4.1-11
- added new decorators.py module for exception logging
- added missing parameter in user.listDefaultSystemGroups
Expand All @@ -19,7 +17,6 @@ changelog =
* Mon Nov 05 2012 Stuart Sears <stuart.sears@man.com> 5.4.1-9
- fixed system.downloadSystemId

>>>>>>> 59e9f818a5ae4523c81e4217122a209f5091979d
* Thu Jun 28 2012 Stuart Sears <stuart.sears@man.com> 5.4.1-7
- finally figured out how to add changelogs using python distutils