test-pr

README.md

@@ -1,6 +1,6 @@
 Sample PHP
 ===============
 
-Build sample for standalone PHP build sample.
+Build sample for standalone PHP build sample. merge conflict
 
 This sample is built for Shippable, a docker based continuous integration and deployment platform.

shippable.yml

@@ -1,15 +1,12 @@
 language: php
 
+
 php: 
  # - 5.3
-   - 5.6
-   - 5.5
-   - 5.4
-
+  - 5.6
+  - 5.5
+  - 5.4
 
-before_install:
- - source ~/.rvm/scripts/rvm && rvm use 2.0.0
-
 before_script: 
   - mkdir -p shippable/codecoverage
   - mkdir -p shippable/testresults
@@ -22,10 +19,11 @@ script:
 notifications:
   email:
     - vidya@shippable.com
-    - vidyac.raghav@gmail.com
+ #   - vidyac.raghav@gmail.com
 
 archive: true
 #cache: true
+
 branches:
   only: 
     - master 

tests/calculator_test.php

@@ -8,7 +8,7 @@ class CalculatorTest extends PHPUnit_Framework_TestCase{
   public function testAdd(){
       $calc = new Calculator();
       $sum = $calc->add(array(2,3,4,5));
-      $this->assertEquals(15, $sum); //check if 2+3+4+5 is equal to 14
+      $this->assertEquals(14, $sum); //check if 2+3+4+5 is equal to 14
   }
 
   //test if the subtract() method in our calculator class