Merge branch 'master' of https://github.com/NOC-MSM/BoBEAS

3ff96b3a · jelt · 3b6b7ca4 · fd4ebfd3 · 3ff96b3a
Commit 3ff96b3a authored 5 years ago by jelt
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

README.md README.md +5 -0

No files found.
--- a/README.md
+++ b/README.md
@@ -44,6 +44,11 @@ BoBEAS
 | | |____scripinterp.patch
 | | |____scripinterp_mod.patch
 | | |____scripshape.patch
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> fd4ebfd3f245c028265f50995d167b3f6af98dd5
 |
 |____SCRIPTS
 | |____load_modules_1.sh