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.

Sign up for GitHub

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

Jump to bottom

Day 4 coding #48

Merged
merged 15 commits into from Dec 25, 2018
Merged

Day 4 coding #48

merged 15 commits into from Dec 25, 2018

Conversation

Shashankjain12
Copy link
Contributor

@Shashankjain12 Shashankjain12 commented Dec 25, 2018 •
edited

Please make sure you have done the following:

  • Created a folder with the name of language you code inside /Day<n>/ directory (Where n is for nth day)
  • Added your Codes
  • Tested your codes
  • Added credits (author and date) at the top of the code
  • Updated README.md
  • Added yourself as a contributor using all-conributors-cli

@Shashankjain12
Copy link
Contributor Author

Day 4 code that was fun 👍

MadhavBahl
MadhavBahl requested changes Dec 25, 2018
View reviewed changes
Copy link
Member

@MadhavBahl MadhavBahl left a comment

Choose a reason for hiding this comment

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

Please remove all these <<<<<<HEAD and ========= statements that you might have used while resolving merge conflicts

Day2/README.md Outdated Show resolved Hide resolved
Day2/README.md Outdated
@@ -662,7 +662,16 @@ if d==e:
else:
print("Not a pallindrome")
```
<<<<<<< HEAD
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

Remove this

Day2/README.md Outdated
>>>>>>> 59b8bd388e0854765c3122d6e802a85978004667
=======

>>>>>>> 6aef1378d44840c82d996e7d0ad58664d70abeae
Copy link
Member

Choose a reason for hiding this comment

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

Remove lines 667 to 674

Day3/README.md Outdated
@@ -282,6 +282,7 @@ else:
print("Hamming Distance = ", HD)
```
##Python Implementation
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

Remove this line as well

Day3/README.md Outdated
* @date: 24/12/2018
"""

>>>>>>> 59b8bd388e0854765c3122d6e802a85978004667
Copy link
Member

Choose a reason for hiding this comment

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

Remove this line

Day3/README.md Outdated
@@ -290,6 +291,16 @@ else:
* @date: 24/12/2018
"""

=======
Copy link
Member

Choose a reason for hiding this comment

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

Please remove all such lines

@Shashankjain12
Copy link
Contributor Author

Looks like merge conflicts again.. :p

@MadhavBahl
Copy link
Member

Looks good, thanks 👍

@MadhavBahl MadhavBahl merged commit a73d208 into CodeToExpress:master Dec 25, 2018
@weekly-digest weekly-digest bot mentioned this pull request Dec 30, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MadhavBahl MadhavBahl MadhavBahl requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Shashankjain12 @MadhavBahl