removed react-16.8 from travis

enzymejs · May 16, 2019 · 56e1abd · 56e1abd
1 parent af7ad1e
commit 56e1abd
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -67,11 +67,8 @@ matrix:
       env: KARMA=true REACT=15
     - node_js: "6"
       env: KARMA=true REACT=16
-<<<<<<< HEAD
     - node_js: "lts/*"
       env: REACT=16.8.5 RENDERER=16.8.3
-=======
->>>>>>> be17876bfab1b4e659265ac5fafb893cab63bfd3
   exclude:
     - node_js: "6"
       env: REACT=0.13