Skip to content

Commit

Permalink
Merge pull request #3 from Sardtok/master
Browse files Browse the repository at this point in the history
Adds Atlassian's GitFlow figure (hotlinking was disabled).
  • Loading branch information
mgfeller authored Jan 5, 2017
2 parents 014be51 + e344367 commit d4de3c6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions AtlassianGitflow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion git.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ <h2>GitFlow</h2>
</section>
<section id="gitflow-gfx">
<h2>Behind the wall of text</h2>
<img style="background-color: #ffffff; max-height: 500px" src="https://www.atlassian.com/git/images/tutorials/collaborating/comparing-workflows/gitflow-workflow/05.svg" />
<img style="background-color: #ffffff; max-height: 500px" src="AtlassianGitflow.svg" />
</section>
<section id="forking">
<h2>Forking</h2>
Expand Down

0 comments on commit d4de3c6

Please sign in to comment.