catalina.md
... ...
@@ -55,7 +55,11 @@ The lastest MacOS provides the option to create links in the root partion via th
55 55
This file has the following format:
56 56
```
57 57
#link target
58
+<<<<<<< HEAD
58 59
programs opt/biogrids
60
+=======
61
+programs /opt/biogrids
62
+>>>>>>> 24976a652b03130f7d858f8e3b05f51697432342
59 63
```
60 64
61 65
Note that the whitespace MUST be a tab character. Spaces will not work.