Resolve merge conflicts

tylerbecks · Jul 21, 2016 · df0e21e · df0e21e
1 parent 4099c84
commit df0e21e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 30,262 deletions.
diff --git a/client/app/components/Navbar.js b/client/app/components/Navbar.js
@@ -0,0 +1,33 @@
+import { Component } from 'react';
+import {}
+
+class MyNav extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    return (
+      <Navbar>
+        <Navbar.Header>
+          <Navbar.Brand>
+            <a href="#">Brand</a>
+          </Navbar.Brand>
+          <Navbar.Toggle />
+        </Navbar.Header>
+        <Navbar.Collapse>
+          <Navbar.Form pullLeft>
+            <FormGroup>
+              <FormControl type="text" placeholder="Search" />
+            </FormGroup>
+            {' '}
+            <Button type="submit">Submit</Button>
+          </Navbar.Form>
+        </Navbar.Collapse>
+      </Navbar>
+    )
+  }
+
+};
+
+export default MyNav;
diff --git a/client/index.html b/client/index.html
@@ -2,11 +2,17 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>title</title>
+    <title>Eat Up</title>
     <script src="public/bundle.js" type="text/javascript"></script>
-  <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDOlaN78KQv4W4AZC-MMfO_1-14PD5R3-Q
-"></script>
+  <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDOlaN78KQv4W4AZC-MMfO_1-14PD5R3-Q"></script>
   <link rel="stylesheet" href="style.css" type="text/css">
+  <!-- <link rel="stylesheet" href="style.css" type="text/css"> -->
+
+  <!-- Latest compiled and minified CSS -->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
+  <!-- Optional theme -->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap-theme.min.css">
+
   </head>
   <body>
     <h1>Eat Up!</h1>