From 7770761ec0a1cfcec8ce51c78ba51f0a931070f8 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@fb.com>
Date: Thu, 13 Apr 2017 11:41:22 -0700
Subject: [PATCH] Quick fix for `eslint` on 15.6-dev branch

The `.eslintignore` had gotten a merge conflict committed accidentally
at some point, and also was not ignoring the `addons` directory. This
fixes that.

We also had a couple of missing commas that snuck in, and those are
fixed here too.
---
 .eslintignore                                                 | 4 +---
 .../classic/class/__tests__/ReactCreateClass-test.js          | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 2d7c565d32494..cdcaed49e239b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 # We can probably lint these later but not important at this point
+addons/
 src/renderers/art
 src/shared/vendor
 # But not in docs/_js/examples/*
@@ -9,11 +10,8 @@ docs/_site/
 docs/vendor/bundle/
 # This should be more like examples/**/thirdparty/** but
 # we should fix https://github.com/facebook/esprima/pull/85 first
-<<<<<<< HEAD
 examples/
-=======
 fixtures/
->>>>>>> 4a37718... Remove examples/ folder (#9323)
 # Ignore built files.
 build/
 coverage/
diff --git a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
index 9c1a44ea5d025..267f5f8ad9c3e 100644
--- a/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactCreateClass-test.js
@@ -367,7 +367,7 @@ describe('ReactClass-spec', () => {
       render() {
         ops.push('Render: ' + this.state.step);
         return <div />;
-      }
+      },
     });
 
     var instance = ReactTestUtils.renderIntoDocument(<Component />);
@@ -414,7 +414,7 @@ describe('ReactClass-spec', () => {
         instance = this;
         this.log('render');
         return <div />;
-      }
+      },
     });
 
     var container = document.createElement('div');