Terkhen / ExtraModMod / issues / #80 - Failed merge — Bitbucket

Issue #80 resolved

joseasoler repo owner created an issue 2013-07-26

http://forums.civfanatics.com/showthread.php?p=12647377#post12647377

Comments (4)

joseasoler reporter
- changed status to invalid
I was not able to find these lines in the place lfgr mentions in my latest version. It was probably a messed up merge with events enhanced, which I inadvertently fixed after redoing the merge.
- 2013-07-27T18:00:43+00:00
lfgr
https://bitbucket.org/Terkhen/extramodmod/src/12d0ad4af613b8320a18c56cb3a3af0ee8a28435/python/entrypoints/CvRandomEventInterface.py?at=extramodmod

See line 3584. The lines I mentioned were MISSING there. The variable "player" in line 3584 is not initialized.

Edit: Or am I looking at the wrong place?
- 2013-07-27T18:10:14+00:00
joseasoler reporter
- changed status to open
Oh, sorry! I misunderstood what you meant... I thought you meant that these lines were not meant to be there.
- 2013-07-27T18:24:53+00:00
joseasoler reporter
- changed status to resolved
The issue has been fixed now, thanks!
- 2013-07-27T18:26:25+00:00
Log in to comment

Assignee: joseasoler

Type: bug

Priority: blocker

Status: resolved

Version: –

Votes: 0

Watchers: 1

Jira: the preferred issue tracker for Bitbucket. Join the team!