From 263ef8b5fd9f4e3d41ead98e052e9ec1a8f548ca Mon Sep 17 00:00:00 2001
From: Jan Rochalski <joonny220@gmail.com>
Date: Mon, 10 Jun 2019 07:53:53 +0200
Subject: [PATCH 1/3] chore/and operator instead of ternary operator (#2064)

---
 content/docs/accessibility.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/docs/accessibility.md b/content/docs/accessibility.md
index 4b202fe4b..61a5a8bc2 100644
--- a/content/docs/accessibility.md
+++ b/content/docs/accessibility.md
@@ -282,13 +282,13 @@ class OuterClickExample extends React.Component {
     return (
       <div ref={this.toggleContainer}>
         <button onClick={this.onClickHandler}>Select an option</button>
-        {this.state.isOpen ? (
+        {this.state.isOpen && (
           <ul>
             <li>Option 1</li>
             <li>Option 2</li>
             <li>Option 3</li>
           </ul>
-        ) : null}
+        )}
       </div>
     );
   }
@@ -348,13 +348,13 @@ class BlurExample extends React.Component {
                 aria-expanded={this.state.isOpen}>
           Select an option
         </button>
-        {this.state.isOpen ? (
+        {this.state.isOpen && (
           <ul>
             <li>Option 1</li>
             <li>Option 2</li>
             <li>Option 3</li>
           </ul>
-        ) : null}
+        )}
       </div>
     );
   }

From 5849f604ccd59b009f7f3e03d5460757bfc2ab34 Mon Sep 17 00:00:00 2001
From: Arnab Sen <arnabsen@gmail.com>
Date: Mon, 10 Jun 2019 07:59:25 +0200
Subject: [PATCH 2/3] Update react-jss link (#2056)

---
 content/community/tools-misc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/community/tools-misc.md b/content/community/tools-misc.md
index ba1e22a22..9d0dacc92 100644
--- a/content/community/tools-misc.md
+++ b/content/community/tools-misc.md
@@ -9,7 +9,7 @@ permalink: community/misc.html
 
 * **[react-inspector](https://github.com/xyc/react-inspector):** Use DevTools-like object inspectors inside your React app.
 * **[jreact](https://github.com/KnisterPeter/jreact):** Rendering react server-side within a JVM (Java 7 or Java 8)
-* **[react-jss](https://github.com/jsstyles/react-jss):** Inject and mount jss styles in React components.
+* **[react-jss](https://github.com/cssinjs/jss/tree/master/packages/react-jss):** Inject and mount jss styles in React components.
 * **[django-react](https://github.com/markfinger/django-react):** Server-side rendering of React components for django apps.
 * **[react-engine](https://github.com/paypal/react-engine):** Composite render engine for isomorphic express apps to render both plain react views and react-router views.
 * **[react-render-visualizer](https://github.com/redsunsoft/react-render-visualizer):** A visual way to see what is (re)rendering and why.

From b91f3d8dc00590acc33746b6131fc68760895af7 Mon Sep 17 00:00:00 2001
From: jakubdrozdek <jakub.drozdek@acaisoft.com>
Date: Wed, 12 Jun 2019 10:03:11 +0200
Subject: [PATCH 3/3] Resolve conflicts

---
 content/docs/accessibility.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/content/docs/accessibility.md b/content/docs/accessibility.md
index 6e6fc943e..4a74c7538 100644
--- a/content/docs/accessibility.md
+++ b/content/docs/accessibility.md
@@ -283,13 +283,8 @@ class OuterClickExample extends React.Component {
   render() {
     return (
       <div ref={this.toggleContainer}>
-<<<<<<< HEAD
         <button onClick={this.onClickHandler}>Wybierz opcję</button>
-        {this.state.isOpen ? (
-=======
-        <button onClick={this.onClickHandler}>Select an option</button>
         {this.state.isOpen && (
->>>>>>> 5849f604ccd59b009f7f3e03d5460757bfc2ab34
           <ul>
             <li>Opcja 1</li>
             <li>Opcja 2</li>