Tyler Bunnell d3d427864d Fix merge conflict

2014-04-22 10:01:40 -06:00

..

assertions_test.go

Fix merge conflict

2014-04-22 10:01:40 -06:00

assertions.go

Fix merge conflict

2014-04-22 10:01:40 -06:00

doc.go

added new assert WithinDuration

2013-09-12 13:24:50 +08:00

errors.go

ExactError, asserts that err is not nil and its string matches

2014-02-15 12:24:39 -05:00