Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dowjames/gekko into staging
Browse files Browse the repository at this point in the history 
Conflicts:
	README.md
	config.js
	core/portfolioManager.js
  • Loading branch information
Sarah White committed Jul 2, 2014
2 parents 9c7887d + cd89180 commit 1c88bb0
Showing 0 changed files with 0 additions and 0 deletions.

1 comment on commit 1c88bb0

@kuzetsa
Copy link
Owner

@kuzetsa kuzetsa commented on 1c88bb0 Jul 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During 6edc357 I had to take a break to work on some stuff IRL even though I was mid-merge...

//quote//

the conflicts are going to take a few commits
... should hopefully be resolved and working soon

My local git tools finally say there's no more conflicts, and that I'm resync'd with github. Yay!

I think @dowjames and myself each took our respective forks in totally different directions,
so these last 3 files were simply never going to match up not matter what I did on my end:

Conflicts:
    README.md
    config.js
    core/portfolioManager.js

Please sign in to comment.