added wazana.io article to be featured on babylonjs homepage#351
Merged
deltakosh merged 3 commits intoBabylonJS:masterfrom Sep 27, 2018
Merged
added wazana.io article to be featured on babylonjs homepage#351deltakosh merged 3 commits intoBabylonJS:masterfrom
deltakosh merged 3 commits intoBabylonJS:masterfrom
Conversation
…sted by deltakosh
Contributor
|
THere is a conflict :) |
deltakosh
reviewed
Sep 26, 2018
| <h2>Demos</h2> | ||
| <div class="gallery"> | ||
| <article class="gallery-item" itemscope="" itemtype="http://schema.org/CreativeWork"> | ||
| <a title="Try WAZANA.IO Game" class="gallery-item-link" href="https://wazana.io/" |
Contributor
There was a problem hiding this comment.
please add "3rd" in the article class :)
Contributor
Author
There was a problem hiding this comment.
Ok I added "3rd" in the article class.
On the conflict, seems like this is an indentation issue. I can't reproduce the conflict in my project between master and homepage-add-wazanaio.
Can you tell me how to resolve it by choosing the master changes?
deltakosh
approved these changes
Sep 27, 2018
Contributor
Author
|
HOORAY! ;) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Following this topic: http://www.html5gamedevs.com/topic/35446-wazanaio/?tab=comments#comment-203467
Thanks ;)