projects / pgopen2019.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a90fc7a)
try again
authorStephen Frost <sfrost@snowman.net>
Thu, 13 Jun 2019 14:33:55 +0000 (10:33 -0400)
committerStephen Frost <sfrost@snowman.net>
Fri, 21 Jun 2019 00:08:52 +0000 (20:08 -0400)
.gitattributes patch | blob | blame | history
templates/context.json patch | blob | blame | history

diff --git a/.gitattributes b/.gitattributes
index 6ff8c20d3b6baf70e2c587d1ae3542552b677566..d330da8bfab61ec085e57379e2c5508da2262e3b 100644 (file)
--- 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 f7429f391a9f5f58f9c30f3916b6266b60492097..0e35b0ed436a77f12c8aa93e92bb2393bb80963f 100644 (file)
--- 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": [
 
PGOpen 2019 Templates