From 9cc2a7a0c9c875182d61e8eca6e3da6e75354e49 Mon Sep 17 00:00:00 2001 From: John David Pressman Date: Fri, 2 Aug 2019 17:15:34 -0700 Subject: [PATCH] Remove uncleared merge conflict marks --- gitlab-pages/docs/language-basics/cheat-sheet.md | 1 - gitlab-pages/docs/setup/installation.md | 5 ----- 2 files changed, 6 deletions(-) diff --git a/gitlab-pages/docs/language-basics/cheat-sheet.md b/gitlab-pages/docs/language-basics/cheat-sheet.md index 032837caa..c754d039f 100644 --- a/gitlab-pages/docs/language-basics/cheat-sheet.md +++ b/gitlab-pages/docs/language-basics/cheat-sheet.md @@ -35,7 +35,6 @@ title: Cheat Sheet |Variants|
type action is
| Increment of int
| Decrement of int
| |Variant *(pattern)* matching|
const a: action = Increment(5);
case a of
| Increment(n) -> n + 1
| Decrement(n) -> n - 1
end
| |Records|
type person is record
  age: int ;
  name: string ;
end

const john : person = record
  age = 18;
  name = "John Doe";
end

const name: string = john.name;
| -<<<<<<< HEAD |Maps|
type prices is map(nat, tez);

const prices : prices = map
  10n -> 60mtz;
  50n -> 30mtz;
  100n -> 10mtz;
end

const price: option(tez) = prices[50n];

prices[200n] := 5mtz;
| |Contracts & Accounts|
const destinationAddress : address = "tz1...";
const contract : contract(unit) = get_contract(destinationAddress);
| |Transactions|
const payment : operation = transaction(unit, amount, receiver);
| diff --git a/gitlab-pages/docs/setup/installation.md b/gitlab-pages/docs/setup/installation.md index 633b1e67d..c9b5c5503 100644 --- a/gitlab-pages/docs/setup/installation.md +++ b/gitlab-pages/docs/setup/installation.md @@ -9,10 +9,6 @@ There are currently two ways to get started with Ligo, both of those will allow > 🐳 You can find instructions on how to install Docker [here](https://docs.docker.com/install/). -<<<<<<< HEAD -Easiest way to use LIGO is through the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo). Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/dev/docker/Dockerfile). -You can either run the docker image yourself, or you can setup a global ligo executable as shown below. -======= It's easiest to use LIGO through one of its Docker images. You have two options, the first is to use our installation script to set up a globally available LIGO executable (see below). This manages the Docker bits for you. The second @@ -20,7 +16,6 @@ is to directly use the Docker image available at [Docker Hub](https://hub.docker This lets you run multiple versions and keep your installation(s) self contained, but requires more familiarity with Docker. Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile). If this is your first time using Docker, you probably want to set up a global ligo executable as shown below. ->>>>>>> Edit installation instructions to emphasize that Docker newbs should use the install script ### Setting up a globally available `ligo` executable