From 74d63c158c71a4b7cb72c71a3f2e289ba16d5986 Mon Sep 17 00:00:00 2001 From: Viktor Farcic Date: Sun, 1 Dec 2019 01:17:24 +0100 Subject: [PATCH 1/3] Finally 1.0.0 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 27df25ca2..9df9b7854 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +VERSION := 9.0.0 SHELL := /bin/bash GO := GO15VENDOREXPERIMENT=1 go NAME := go-demo-6 From f9aaaee723cdcc61f5938a1a4d8346bd075541eb Mon Sep 17 00:00:00 2001 From: Viktor Farcic Date: Sun, 1 Dec 2019 01:21:52 +0100 Subject: [PATCH 2/3] A silly change --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index fcd89a90d..c7bda3515 100644 --- a/README.md +++ b/README.md @@ -1,13 +1 @@ -## Replace master with orig - -```bash -git checkout orig - -git merge -s ours master - -git checkout master - -git merge orig - -git push -``` +A silly change From 61e0295b4c3988513a8ca4e4e6459bc6c12bedcb Mon Sep 17 00:00:00 2001 From: Viktor Farcic Date: Sun, 1 Dec 2019 02:06:36 +0100 Subject: [PATCH 3/3] Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9df9b7854..7867c9cc7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := 9.0.0 +VERSION := 1.0.0 SHELL := /bin/bash GO := GO15VENDOREXPERIMENT=1 go NAME := go-demo-6