Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development
Conflicts: README.md
This commit is contained in:
commit
7fd20ba641
2 changed files with 23 additions and 60 deletions
|
@ -49,9 +49,15 @@ Thus, by running this script below, you agree with the Let's Encrypt's Terms of
|
|||
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
1. Login as root. (I had some problems running npm as root on CentOS 7 on AWS. This seems to be fixed by the seemingly extraneous `su` within `sudo`.)
|
||||
```
|
||||
sudo su -
|
||||
=======
|
||||
1. Login as root
|
||||
```
|
||||
sudo -i
|
||||
>>>>>>> c3f5e6a6282e6fae51392b9a9f89edade3d614a1
|
||||
```
|
||||
|
||||
2. Install git
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue