Merge branch 'master' of github.com:cobrateam/splinter

andrewsmedina · andrewsmedina · commit f9bbbb7086fb · 2012-07-18T23:58:23.000-03:00
Conflicts:
	VERSION
	docs/conf.py
	setup.py
	splinter/__init__.py
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ coverage:
 	@python -c 'import coverage' 2>/dev/null || pip install coverage==3.5.1
 
 selenium:
-	@python -c 'import selenium' 2>/dev/null || pip install selenium==2.25.0
+	@python -c 'import selenium' 2>/dev/null || pip install selenium==2.24.0
 
 unittest2:
 	@python -c 'from unittest import skip' 2>/dev/null || pip install unittest2
diff --git a/VERSION b/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 0.4.6
+=======
+
+>>>>>>> 6f910b979a9ed618b10d2a6bd28a5a343d3d3df9
diff --git a/setup.py b/setup.py
@@ -16,6 +16,6 @@
       author_email='andrewsmedina@gmail.com',
       packages=find_packages(exclude=['docs', 'tests', 'samples']),
       include_package_data=True,
-      install_requires=['selenium>=2.25.0', 'lxml>=2.3.1,<2.4.0'],
+      install_requires=['selenium>=2.24.0', 'lxml>=2.3.1,<2.4.0'],
       tests_require=['coverage', 'flask'],
       )

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 +<<<<<<< HEAD
 .4.6
 +=======
++
 +>>>>>>> 6f910b979a9ed618b10d2a6bd28a5a343d3d3df9
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`author_email='andrewsmedina@gmail.com',`
`17`	`17`	`packages=find_packages(exclude=['docs', 'tests', 'samples']),`
`18`	`18`	`include_package_data=True,`
`19`		`- install_requires=['selenium>=2.25.0', 'lxml>=2.3.1,<2.4.0'],`
	`19`	`+ install_requires=['selenium>=2.24.0', 'lxml>=2.3.1,<2.4.0'],`
`20`	`20`	`tests_require=['coverage', 'flask'],`
`21`	`21`	`)`