-
Notifications
You must be signed in to change notification settings - Fork 23
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.
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
Styled my about me page with css #61
Open
JonathanEdradan
wants to merge
26
commits into
sf-wdi-14:master
Choose a base branch
from
JonathanEdradan:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge branch 'master' of https://github.com/sf-wdi-14/notes Conflicts: blogs.md
wq :wq :q Merge branch 'master' of https://github.com/sf-wdi-14/notes # the commit. q: :q :wq
@@ -23,4 +23,8 @@ | |||
* [Ben Manning](https://medium.com/@pookymane/the-big-coding-adventure-4ef5df47cd7a) | |||
* [Abhishek Bhan](https://medium.com/@abhishekbhan/web-development-ae63f82ca91d) | |||
* [Vikash Parekh](https://medium.com/@vikash/well-hello-world-my-name-is-vikash-parekh-and-i-have-created-this-blog-in-order-to-track-the-a6f0813c6bb2) | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix the merge conflict. Just remove the lines containing <<<<<<<
, =======
, >>>>>>>
.
choskim
force-pushed
the
master
branch
3 times, most recently
from
January 6, 2015 22:52
fc1a3f1
to
c6a83d0
Compare
dchacke-ga
force-pushed
the
master
branch
4 times, most recently
from
January 29, 2015 18:25
ee45094
to
b4cd58d
Compare
choskim
force-pushed
the
master
branch
5 times, most recently
from
February 3, 2015 16:05
2f5a207
to
40479f2
Compare
choskim
force-pushed
the
master
branch
6 times, most recently
from
February 5, 2015 17:33
05dba09
to
542575e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.