Skip to content

Instantly share code, notes, and snippets.

Avatar

Matt Way matt-way

View GitHub Profile
@matt-way
matt-way / ajaxtest.txt
Created Dec 22, 2015
Some dummy text to help with an ajax question on SO
View ajaxtest.txt
Attack on Titan|http://www.anime-planet.com/anime/attack-on-titan
Durarara!!|http://www.anime-planet.com/anime/durarara
Byoukai no Kanata|http://www.anime-planet.com/anime/beyond-the-boundary
View gist:6119878
Windows PowerShell
Copyright (C) 2009 Microsoft Corporation. All rights reserved.
E:\memebig\projects\memeBig [Journal/Action-unstyled-completion]> git checkout m
aster
Switched to branch 'master'
E:\memebig\projects\memeBig [master]> git merge Journal/Action-unstyled-completi
on
Auto-merging public/css/less/journal.less
CONFLICT (content): Merge conflict in public/css/less/journal.less
View gist:6119877
Windows PowerShell
Copyright (C) 2009 Microsoft Corporation. All rights reserved.
E:\memebig\projects\memeBig [Journal/Action-unstyled-completion]> git checkout m
aster
Switched to branch 'master'
E:\memebig\projects\memeBig [master]> git merge Journal/Action-unstyled-completi
on
Auto-merging public/css/less/journal.less
CONFLICT (content): Merge conflict in public/css/less/journal.less
You can’t perform that action at this time.