merge

.editorconfig

@@ -1,7 +1,11 @@
 root = true
 
 [*]
+<<<<<<< HEAD
 end_of_line = lf
+=======
+end_of_line = crlf
+>>>>>>> ee42c83e39ef2a5bc939b6a0b9e3e562e30f278f
 insert_final_newline = false
 indent_style = space
 indent_size = 2

app/components/About/index.js

@@ -0,0 +1,17 @@
+/* eslint linebreak-style: ["error", "windows"]*/
+
+import React from 'react';
+
+import { FormattedMessage } from 'react-intl';
+import messages from './messages';
+
+
+function About() {
+  return (
+    <div>
+      <FormattedMessage {...messages.header} />
+    </div>
+  );
+}
+
+export default About;

app/components/About/messages.js

@@ -0,0 +1,14 @@
+/* eslint linebreak-style: ["error", "windows"]*/
+/*
+ * About Messages
+ *
+ * This contains all the text for the About component.
+ */
+import { defineMessages } from 'react-intl';
+
+export default defineMessages({
+  header: {
+    id: 'app.components.About.header',
+    defaultMessage: 'This is the About component !',
+  },
+});

app/components/About/tests/index.test.js

@@ -0,0 +1,11 @@
+// import About from '../index';
+
+import expect from 'expect';
+// import { shallow } from 'enzyme';
+// import React from 'react';
+
+describe('<About />', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});

app/containers/HomePage/messages.js

@@ -8,6 +8,6 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   header: {
     id: 'app.components.HomePage.header',
-    defaultMessage: 'This is HomePage components !',
+    defaultMessage: 'This is HomePage components!',
   },
 });

app/routes.js

@@ -34,6 +34,17 @@ export default function createRoutes(store) {
         importModules.catch(errorLoading);
       },
     }, {
+<<<<<<< HEAD
+=======
+      path: '/about',
+      name: 'about',
+      getComponent(location, cb) {
+        System.import('components/About')
+          .then(loadModule(cb))
+          .catch(errorLoading);
+      },
+    }, {
+>>>>>>> ee42c83e39ef2a5bc939b6a0b9e3e562e30f278f
       path: '*',
       name: 'notfound',
       getComponent(nextState, cb) {