Skip to content

Commit

Permalink
Merge pull request #1 from chrismayer/resolve-conflicts-for-320
Browse files Browse the repository at this point in the history
Resolve conflicts for Wegue wegue-oss#320
  • Loading branch information
spwoodcock authored May 15, 2023
2 parents 6a7efe1 + df44177 commit 12d4fa6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/_coverpage.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wegue <small>1.2.0</small>
# Wegue <small>1.2.1</small>

> Simple Webmapping with OpenLayers and Vue.js
Expand Down
8 changes: 4 additions & 4 deletions docs/workshop.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Workshop

This workshop uses Wegue version [`v1.2.0`](https://github.com/wegue-oss/wegue/releases/tag/v1.2.0) but works for higher versions with no or little adaptation.
This workshop uses Wegue version [`v1.2.1`](https://github.com/wegue-oss/wegue/releases/tag/v1.2.1) but works for higher versions with no or little adaptation.

## Prerequisites

Expand All @@ -12,7 +12,7 @@ You should have basic knowledge of using a commandline and a basic understanding

For this workshop or to quickly try something, you can use the online-environment Gitpod. For this you need a browser and you need to register at Gitpod. That can be done with an existing GitHub account.

To get started navigate to [**gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.0**](https://gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.0). Ideally, you will see a terminal running commands to set up Wegue. After some moments (~1 minute) you should see a running Wegue instance in one of the editor's panes like in this screenshot.
To get started navigate to [**gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.1**](https://gitpod.io/#https://github.com/wegue-oss/wegue/tree/v1.2.1). Ideally, you will see a terminal running commands to set up Wegue. After some moments (~1 minute) you should see a running Wegue instance in one of the editor's panes like in this screenshot.

![Wegue running in Gitpod](_media/workshop/gitpod-wegue.png)

Expand All @@ -37,10 +37,10 @@ We need to download Wegue. This can be done in two ways:
cd wegue
# checkout the version of the Workshop
git checkout v1.2.0
git checkout v1.2.1
```
- Alternatively download a zip-archive of Wegue via GitHub using this [link](https://github.com/wegue-oss/wegue/archive/refs/tags/v1.2.0.zip) and extract it.
- Alternatively download a zip-archive of Wegue via GitHub using this [link](https://github.com/wegue-oss/wegue/archive/refs/tags/v1.2.1.zip) and extract it.
## Start Wegue
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wegue",
"version": "1.2.0",
"version": "1.2.1",
"description": "Template project for a WebGIS client with OpenLayers and Vue.js",
"author": "Christian Mayer <[email protected]>",
"contributors": [
Expand Down

0 comments on commit 12d4fa6

Please sign in to comment.