Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathias Ettinger committed Dec 14, 2022
2 parents 29702c6 + a8b904d commit f132a0c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ The debian packages can be installed using `apt` commands.

Unless otherwise specified, all the commands here must be executed on all machines.

In order to install the packages using `apt`, the repository must be added to its sources.
One way of doing it is by adding a new file into the `/etc/apt/sources.list.d/` folder.
In order to install the packages using `apt`, the repository must be added to its sources. One way of doing it is by creating the file `/etc/apt/sources.list.d/net4sat.list`.

Start by adding the GPG key for the Net4Sat repository:

Expand All @@ -76,7 +75,7 @@ curl -sS https://raw.githubusercontent.com/CNES/net4sat-packages/master/gpg/net4
Then add the repository and link it to the aforementionned GPG key:

```
echo "deb https://raw.githubusercontent.com/CNES/net4sat-packages/master/ focal stable" | sudo tee /etc/apt/sources.list.d/net4sat.list
echo "deb https://raw.githubusercontent.com/CNES/net4sat-packages/master/jammy/ jammy stable" | sudo tee /etc/apt/sources.list.d/net4sat.list
```

An apt sources update is necessary after adding the repository:
Expand Down

0 comments on commit f132a0c

Please sign in to comment.