merge conflicts

Author: mjhea0

buildspec.yml

@@ -3,11 +3,7 @@ version: 0.2
 env:
   variables:
     AWS_REGION: "us-west-1"
-<<<<<<< HEAD
     REACT_APP_API_SERVICE_URL: "http://flask-react-alb-166710978.us-west-1.elb.amazonaws.com"
-=======
-    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-1132421372.us-west-1.elb.amazonaws.com"
->>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 
 phases:
   pre_build:

services/client/src/App.jsx

@@ -1,22 +1,12 @@
 import React, { Component } from "react";
 import axios from "axios";
-<<<<<<< HEAD
 import { Route, Routes } from "react-router-dom";
 import Modal from "react-modal";
 
 import About from "./components/About";
 import AddUser from "./components/AddUser";
 import LoginForm from "./components/LoginForm";
 import Message from "./components/Message";
-=======
-import { Route, Switch } from "react-router-dom";
-
-import AddUser from "./components/AddUser";
-import About from "./components/About";
-import LoginForm from "./components/LoginForm";
-import Message from "./components/Message";
-import Modal from "react-modal";
->>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 import NavBar from "./components/NavBar";
 import RegisterForm from "./components/RegisterForm";
 import UsersList from "./components/UsersList";
@@ -51,11 +41,7 @@ class App extends Component {
 
   componentDidMount() {
     this.getUsers();
-<<<<<<< HEAD
   }
-=======
-  };
->>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 
   addUser = (data) => {
     axios

services/users/src/tests/test_users_unit.py

@@ -1,6 +1,3 @@
-# src/tests/test_users_unit.py
-
-
 import json
 from datetime import datetime