Skip to content
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.

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

Leftover git markup in Interceptor.cs #43

Closed
Pjanssen opened this issue Apr 10, 2013 · 3 comments
Closed

Leftover git markup in Interceptor.cs #43

Pjanssen opened this issue Apr 10, 2013 · 3 comments

Comments

@Pjanssen
Copy link
Contributor

I think there's some leftover git merge markup in Interceptor.cs:
line157 <<<<<<< HEAD
line 250 =======
line 259 >>>>>>> upstream/dev

@kzu
Copy link
Contributor

kzu commented Apr 11, 2013

Damn, that's right! I merged the pull request from the web...

Related to #36 :(

@yonahw
Copy link
Contributor

yonahw commented Apr 12, 2013

Truly sorry about that, I'm not generally in the habit of committing code without first compiling and running tests. Included a pull request this morning which I believe fixes the issue and definitely compiles and passes tests locally.

@kzu kzu closed this as completed in 7f0a7d4 Apr 12, 2013
kzu added a commit that referenced this issue Apr 12, 2013
Remove leftover git markup and code erroneously included in bad merge. Fixes #43
@kzu
Copy link
Contributor

kzu commented Apr 12, 2013

cool, thanks!

/kzu

Daniel Cazzulino

On Fri, Apr 12, 2013 at 7:36 AM, Yonah Wahrhaftig
notifications@github.comwrote:

Truly sorry about that, I'm not generally in the habit of committing code
without first compiling and running tests. Included a pull request this
morning which I believe fixes the issue and definitely compiles and passes
tests locally.


Reply to this email directly or view it on GitHubhttps://github.com//issues/43#issuecomment-16286312
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants