Merge pull request #282 from hannanel100/fix-HelloMessage-error

fixed error in HelloMessage component

Author: galnir

content/home/examples/a-simple-component.js

@@ -1,6 +1,5 @@
 class HelloMessage extends React.Component {
   render() {
-<<<<<<< HEAD
     return (
       <div>
         שלום {this.props.name}
@@ -13,10 +12,3 @@ ReactDOM.render(
   <HelloMessage name="יהונתן" />,
   document.getElementById('hello-example')
 );
-=======
-    return <div>Hello {this.props.name}</div>;
-  }
-}
-
-root.render(<HelloMessage name="Taylor" />);
->>>>>>> 84ad3308338e2bb819f4f24fa8e9dfeeffaa970b