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

Already on GitHub? Sign in to your account

Unit test bugfix to allow setting columns for report method. #1848

Merged
merged 3 commits into from Oct 5, 2012

Conversation

Projects
None yet
2 participants
Contributor

CodingWithKyle commented Oct 3, 2012

Fixes Issue #395

Contributor

narfbg commented Oct 4, 2012

Can you add a changelog entry describing the fix?

Contributor

CodingWithKyle commented Oct 4, 2012

Sure thing! Ooopsies.

Updated changelog with bugfix (#395)
Signed-off-by: Kyle Johnson <blyxx86@gmail.com>
Contributor

narfbg commented Oct 5, 2012

... and unfortunately due to other stuff being merged. Yours now is in a conflict (the changelog exactly). Can you pull in latest changes and poke me when ready so I can merge it?

Fixed conflicts in changelog to reflect all changes.
Conflicts:
	user_guide_src/source/changelog.rst
Contributor

CodingWithKyle commented Oct 5, 2012

@narfbg It's ready when you have the chance (This source-control stuff is new to me, so you're forcing me to learn!!!)

narfbg added a commit that referenced this pull request Oct 5, 2012

Merge pull request #1848 from blyxx86/develop
Unit test bugfix to allow setting columns for report method.

@narfbg narfbg merged commit 6dba0cd into bcit-ci:develop Oct 5, 2012

1 check passed

default The Travis build passed
Details

nonchip pushed a commit to nonchip/CodeIgniter that referenced this pull request Jun 29, 2013

Merge pull request #1848 from blyxx86/develop
Unit test bugfix to allow setting columns for report method.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment