From 1a0526d6e36e30cfa8de6e382f4d7df98eeb3122 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 8 Apr 2024 11:22:58 -0400
Subject: [PATCH] general cleanup

---
 src/components/Upload/Forms/DynamicForm.js  |  1 -
 src/components/Upload/Forms/FileDropzone.js | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/src/components/Upload/Forms/DynamicForm.js b/src/components/Upload/Forms/DynamicForm.js
index daf81559..32f53712 100755
--- a/src/components/Upload/Forms/DynamicForm.js
+++ b/src/components/Upload/Forms/DynamicForm.js
@@ -216,7 +216,6 @@ class DynamicForm extends Component {
 								<FileDropzone uploader={uploader} isUploading={this.props.isUploading}/>
 							</Col>
 						</Row>
-					}
 					<h4>STEP 3: Click upload and add your files with the upload instructions that follow</h4>
 					<Row className="fixed-bottom pt-4" id="form-footer">
 						<div className="container justify-content-center">
diff --git a/src/components/Upload/Forms/FileDropzone.js b/src/components/Upload/Forms/FileDropzone.js
index 0ec45b4c..9c203132 100644
--- a/src/components/Upload/Forms/FileDropzone.js
+++ b/src/components/Upload/Forms/FileDropzone.js
@@ -3,20 +3,11 @@ import Gallery from 'react-fine-uploader/gallery';
 import PropTypes from 'prop-types';
 
 class FileDropzone extends Component {
-<<<<<<< HEAD
-
-=======
-	
->>>>>>> origin/develop
 	uploadFile(e) {
 		e.preventDefault();
 		document.getElementById("upload").click();
 	}
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> origin/develop
 	render() {
 		let cancelButtonClass = "react-fine-uploader-gallery-cancel-button";
 		if (this.props.isUploading) {
@@ -37,9 +28,4 @@ FileDropzone.propTypes = {
 	uploader: PropTypes.object.isRequired,
 	isUploading: PropTypes.bool
 }
-
-<<<<<<< HEAD
-export default FileDropzone; 
-=======
 export default FileDropzone;
->>>>>>> origin/develop