From a21da73422f2c57b96b1044941b42c70a871c5ef Mon Sep 17 00:00:00 2001 From: Stephen Frost Date: Thu, 13 Jun 2019 10:33:55 -0400 Subject: [PATCH] try again --- .gitattributes | 2 +- templates/context.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6ff8c20..d330da8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -templates/context.json merge=ours +context.json merge=ours diff --git a/templates/context.json b/templates/context.json index f7429f3..0e35b0e 100644 --- a/templates/context.json +++ b/templates/context.json @@ -1,7 +1,7 @@ { - "linkbase": "https://2019.postgresopen.org/", - "mediabase": "https://2019.postgresopen.org/", - "pgusbase": "https://postgresql.us/", + "linkbase": "https://2019.beta.postgresopen.org/", + "mediabase": "https://2019.beta.postgresopen.org/", + "pgusbase": "https://test.postgresql.us/", "blogposts": [ -- 2.39.5