aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos.K <freedomrfox@gmail.com>2017-05-31 17:37:12 +0300
committerChristos.K <freedomrfox@gmail.com>2017-05-31 17:37:12 +0300
commitd3c40a5741c91e411cde8da78ec30e3ccfc7e2da (patch)
tree55fe813dccb160471f3261b3b7eeb7b8c6aaa2da /README.md
parentUpdated gitignore (diff)
downloadGSE-d3c40a5741c91e411cde8da78ec30e3ccfc7e2da.tar.gz
GSE-d3c40a5741c91e411cde8da78ec30e3ccfc7e2da.tar.bz2
GSE-d3c40a5741c91e411cde8da78ec30e3ccfc7e2da.zip
Updated README.md
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 0 insertions, 3 deletions
diff --git a/README.md b/README.md
index c3251ab..902e7d0 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,6 @@ A future thought would be creating a service inside the machine which will be di
- /boot/
- /boot/logs
- /user-data/ 3*
-<<<<<<< HEAD
- /user-data/persistent
- {local,rmount}
- /local/{root,home,mnt,media}
@@ -62,7 +61,6 @@ A future thought would be creating a service inside the machine which will be di
- tmpfs
- /user-data/tmpfs
- {tmp,var,etc}
-=======
- /user-data/persistent
- {local,rmount}
- /local/{root,home,mnt,media}
@@ -70,7 +68,6 @@ A future thought would be creating a service inside the machine which will be di
- tmpfs
- /user-data/tmpfs
- {tmp,var,etc}
->>>>>>> 47c93c45f8850c954111560b0da6f77dc251043b
- /tmp
- /var/tmp