resources: Fix bad merge in src/riscv-ubuntu/README.md
Change-Id: Iee57fdd24e3c3a3ac0ae34922e84f09736b31efb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/66411
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
diff --git a/src/riscv-ubuntu/README.md b/src/riscv-ubuntu/README.md
index 66915a6..805ed3c 100644
--- a/src/riscv-ubuntu/README.md
+++ b/src/riscv-ubuntu/README.md
@@ -34,12 +34,10 @@
| |___ shared/ # Auxiliary files needed for disk creation
| | |___ serial-getty@.service # Auto-login script
| |___ riscv-ubuntu/
-<<<<<<< HEAD
| |___ gem5_init.sh # The script to be appended to .bashrc on the disk image
| |___ post-installation.sh # The script manipulating the disk image
| |___ riscv-ubuntu.json # The Packer script
| |___ exit.sh # A script that calls m5 exit
->>>>>>> develop
|
|
|___ README.md # This README file
