Changeset c876f29 for gitlab-build.sh


Ignore:
Timestamp:
02/05/19 09:50:43 (2 years ago)
Author:
Jacob Van Walraven <jcv9@…>
Branches:
develop
Children:
5e5b6ca
Parents:
db919d5 (diff), 1c3f8d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve merge conflict attempt 2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gitlab-build.sh

    rdd48bb5 r1c3f8d2  
    1111    apt-utils ssl-cert ca-certificates gnupg lsb-release debhelper git
    1212
    13 echo "deb https://packages.wand.net.nz $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/wand.list
     13echo "deb https://dl.bintray.com/wand/general $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/wand.list
     14echo "deb https://dl.bintray.com/wand/libtrace $(lsb_release -sc) main" | tee -a /etc/apt/sources.list.d/wand.list
    1415curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg
    1516
Note: See TracChangeset for help on using the changeset viewer.