Merge remote-tracking branch 'Paulche/patch-1'

* Paulche/patch-1: Hreffy reference to #42 Conflicts: README.markdown
travisjeffery · Aug 4, 2013 · 38cd45a · bquorning · Aug 16, 2013 · 38cd45a
2 parents 48daaab + b63c660
commit 38cd45a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -111,6 +111,7 @@ Time.now
 # => 2012-09-21 06:22:59 -0500
 ```
 
+<<<<<<< HEAD
 ### Timecop.safe_mode
 
 Safe mode forces you to use Timecop with the block syntax since it always puts time back the way it was. If you are running in safe mode and use Timecop without the block syntax `Timecop::SafeModeException` will be raised to tell the user they are not being safe.
@@ -128,7 +129,7 @@ Timecop.freeze
 # => Timecop::SafeModeException: Safe mode is enabled, only calls passing a block are allowed.
 ```
 
-See #42 for more information, thanks to Ken Mayer, David Holcomb, and Pivotal Labs.
+See [#42](https://github.com/travisjeffery/timecop/pull/42) for more information, thanks to Ken Mayer, David Holcomb, and Pivotal Labs.
 
 ## Contribute
 
@@ -146,4 +147,3 @@ Here's the most direct way to get your work merged into the project.
 - Push the branch up to your fork
 - Send a pull request for your branch
 
-