merged from upstream

enzymejs · May 16, 2019 · af7ad1e · af7ad1e
2 parents 2ba3cb0 + be17876
commit af7ad1e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -67,8 +67,11 @@ 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