Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
<<<<<<< HEAD
=======
function patients($count = 20,$offset=0) {
//unmodified code here
}
>>>>>>> 1f7cf457993ef185a960744695e79229b2acc055
These are scattered around my code, having been inserted by the github client or Titanium studio. I am completely at a loss.
gitis telling you that you have conflicts. Resolve them: http://www.kernel.org/pub/software/scm/git/docs/v1.7.3/user-manual.html#resolving-a-merge