resolve conflicts

18F · Jan 7, 2016 · 907db99 · 907db99
2 parents 3ac9ed7 + e535f13
commit 907db99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/index.md b/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.