Skip to content

Commit 101846a

Browse files
committed
cs
1 parent 539ab48 commit 101846a

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

install.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ <h3>Composer</h3>
5555
<p>
5656
<pre><code>php composer.phar require "codeception/codeception:*"</code></pre>
5757
</p>
58-
<<<<<<< HEAD
5958
<p>From now on Codeception (with installed PHPUnit) can be run as:</p>
6059
<p>
6160
<pre><code>php vendor/bin/codecept</code></pre>
@@ -66,15 +65,13 @@ <h3>Composer</h3>
6665
</p>
6766
<h3>Minimal Codeception</h3>
6867
<p>Currently Codeception installs Webdriver and Guzzle libraries as dependencies. If you don't plan to do acceptance testing, you can get minimal installation of Codeception by requiring `codeception/base`</p>
69-
=======
7068
</div>
7169
<p><a href="http://codeception.com/php54/codecept.phar">Download phar for PHP 5.4 and 5.5</a></p>
7270
<p>For PHP 5.3 <a href="/builds">use the latest version of Codeception 1.8.x</a></p>
7371

7472

7573
<p>Prepare tests directory and configs</p>
7674
<div>
77-
>>>>>>> Codeception/master
7875
<p>
7976
<pre><code>php composer.phar require "codeception/base:*" --dev</code></pre>
8077
</p>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy