Permalink
Browse files

Merge branch '1-0-2'

Conflicts:
	README.md
	lib/capybara/poltergeist/version.rb
  • Loading branch information...
2 parents 05f26a9 + 40c9136 commit 7cfd512bff6248bfc912d4ae937bf1b4d5120b12 @jonleighton jonleighton committed Oct 30, 2012
Showing with 7 additions and 1 deletion.
  1. +6 −0 README.md
  2. +1 −1 lib/capybara/poltergeist/version.rb
View
@@ -1,6 +1,10 @@
# Poltergeist - A PhantomJS driver for Capybara #
+<<<<<<< HEAD
Version: 1.0.1
+=======
+Version: 1.0.2
+>>>>>>> 1-0-2
[![Build Status](https://secure.travis-ci.org/jonleighton/poltergeist.png)](http://travis-ci.org/jonleighton/poltergeist)
@@ -298,6 +302,8 @@ Include as much information as possible. For example:
* Add `page.driver.click(x, y)` to click precise coordinates.
(Micah Geisel)
+### 1.0.2 ###
+
#### Bug fixes ####
* Clearing the value before setting a new value by sending a backspace.
@@ -1,5 +1,5 @@
module Capybara
module Poltergeist
- VERSION = "1.0.1"
+ VERSION = "1.0.2"
end
end

0 comments on commit 7cfd512

Please sign in to comment.