"master" branch looks to have auto-merge issues

[jvanasco]

/HISTORY.txt is from the 1.3 release
/setup.py is from the 1.4 release

I'm not sure what other files are 1.3.? or 1.4.? , but a resync might be a good idea.

[mcdonc]

I don't know what this means, sorry. What are you trying to do?

[jvanasco]

I was just looking at source to see how Pyramid was doing certain things. On the current master branch ( https://github.com/pylons/pyramid ) you'll see that that HISTORY.txt file ( https://github.com/Pylons/pyramid/blob/master/HISTORY.txt ) is from the 1.3x branch , while the setup.py file ( https://github.com/Pylons/pyramid/blob/master/setup.py ) indicates that it is from the 1.4x branch.

i just wanted to alert that the repo might have had an issue with someone merging in updates. git sometimes screws up during an automerge , and this looks like that might have happened to someone.

i could also be totally wrong.

[mcdonc]

Nope it's all good. The master is just a continuation from 1.4, HISTORY.txt gets updated when there's a new release, and setup.py probably hasn't changed since we released 1.4.