Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

resolve conflicts

  • Loading branch information...
Nick Brethauer
Nick Brethauer committed Jan 7, 2016
2 parents 3ac9ed7 + e535f13 commit 907db99f158dc3028a293774ea637332acb9a0d6
Showing with 1 addition and 1 deletion.
  1. +1 −1 index.md
@@ -27,4 +27,4 @@ If you'd like to question, clarify, or contribute to this guide, please head to

**Credit and thanks**

Many of these ideas — and some of the worksheets, such as the identifying assumptions worksheet — are based on works written by Jeff Gothelf, Josh Seiden, and Eric Ries.
Many of these ideas — and some of the worksheets, such as the identifying assumptions worksheet — are based on works written by Jeff Gothelf, Josh Seiden, and Eric Ries.

0 comments on commit 907db99

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.