forked from skillcrush/105-coding_resources
-
Notifications
You must be signed in to change notification settings - Fork 0
Resolved a merge conflict. Edited the same line of code in the same file on different branches and merged the branches. Resolved conflicted file by choosing the best commit. Committed your changes and pushed commit to GitHub account
daehako/105-coding_resources
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
About
Resolved a merge conflict. Edited the same line of code in the same file on different branches and merged the branches. Resolved conflicted file by choosing the best commit. Committed your changes and pushed commit to GitHub account
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published
Languages
- HTML 64.0%
- CSS 36.0%