← Back to branch summary

~cmiller/chromium-browser/ppa-state-stable-lucid

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Chad Miller
  • Date: 2013-02-27 15:46:05 UTC
  • mfrom: (558.11.58 p-oneiric)
  • Revision ID: chad.miller@canonical.com-20130227154605-vht4hnc4h7kunvas
Remove bad merge lines from control file about chromedriver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
157
157
Provides: chromium-codecs-ffmpeg-nonfree-dbg
158
158
Description: chromium-codecs-ffmpeg-extra debug symbols
159
159
 Debug symbols for the extra ffmpeg-mt codecs
160
 
<<<<<<< TREE
161
 
=======
162
 
 
163
 
Package: chromium-chromedriver
164
 
Architecture: armhf armel i386 amd64
165
 
Pre-Depends: dpkg (>= 1.15.6)
166
 
Depends: ${shlibs:Depends}, ${misc:Depends}, chromium-browser (>= 4.0.203.0~)
167
 
Description: WebDriver driver for the Chromium Browser
168
 
 Chromedriver serves as a bridge between Chromium Browser and Selenium 
169
 
 WebDriver.
170
 
 .
171
 
 See http://code.google.com/p/selenium/wiki/ChromeDriver for details.
172
 
>>>>>>> MERGE-SOURCE