I have merged your changes into two branches
* GSOC2015
* GSOC2015-merged
While GSOC2015 contained changes only from shubham, the merged branch
contain changes from both PRs. Please read again the guide
(requirements) that you got for GSoC and the coding standard
guidelines. There are
On Sat, Jul 25, 2015 at 11:07 PM, Inderpreet Singh indrp...@gmail.com wrote:
I have merged your changes into two branches
* GSOC2015
* GSOC2015-merged
@Inderpreet
I am facing merge conflicts in following files
OGV/.meteor/release: needs update
OGV/.meteor/versions: needs merge
I updated
On Sun, Jul 26, 2015 at 12:11 PM, Shubham Chauhan
shubham13...@iiitd.ac.in wrote:
Where are the comments that you are referring to here?
I mean, I have commented out some code that conflicted between yours
and deepak's. Also you will be getting comments on your commits on
specific files. If you
