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
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 |
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
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 |
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
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 |