From 8e21b4e2b7fe9d38985cc9fab266808083aa4158 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 11 May 2015 13:09:23 +0000
Subject: [PATCH] main/postgresql-bdr*: move from testing

the conflict should be resolved now
---
 {testing => main}/postgresql-bdr-extension/APKBUILD            | 0
 {testing => main}/postgresql-bdr/APKBUILD                      | 0
 {testing => main}/postgresql-bdr/initdb.patch                  | 0
 {testing => main}/postgresql-bdr/pgbdr-restore.confd           | 0
 {testing => main}/postgresql-bdr/pgbdr-restore.initd           | 0
 {testing => main}/postgresql-bdr/postgresql-bdr-osxflags.patch | 0
 {testing => main}/postgresql-bdr/postgresql-bdr.confd          | 0
 {testing => main}/postgresql-bdr/postgresql-bdr.initd          | 0
 {testing => main}/postgresql-bdr/postgresql-bdr.pre-upgrade    | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename {testing => main}/postgresql-bdr-extension/APKBUILD (100%)
 rename {testing => main}/postgresql-bdr/APKBUILD (100%)
 rename {testing => main}/postgresql-bdr/initdb.patch (100%)
 rename {testing => main}/postgresql-bdr/pgbdr-restore.confd (100%)
 rename {testing => main}/postgresql-bdr/pgbdr-restore.initd (100%)
 rename {testing => main}/postgresql-bdr/postgresql-bdr-osxflags.patch (100%)
 rename {testing => main}/postgresql-bdr/postgresql-bdr.confd (100%)
 rename {testing => main}/postgresql-bdr/postgresql-bdr.initd (100%)
 rename {testing => main}/postgresql-bdr/postgresql-bdr.pre-upgrade (100%)

diff --git a/testing/postgresql-bdr-extension/APKBUILD b/main/postgresql-bdr-extension/APKBUILD
similarity index 100%
rename from testing/postgresql-bdr-extension/APKBUILD
rename to main/postgresql-bdr-extension/APKBUILD
diff --git a/testing/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD
similarity index 100%
rename from testing/postgresql-bdr/APKBUILD
rename to main/postgresql-bdr/APKBUILD
diff --git a/testing/postgresql-bdr/initdb.patch b/main/postgresql-bdr/initdb.patch
similarity index 100%
rename from testing/postgresql-bdr/initdb.patch
rename to main/postgresql-bdr/initdb.patch
diff --git a/testing/postgresql-bdr/pgbdr-restore.confd b/main/postgresql-bdr/pgbdr-restore.confd
similarity index 100%
rename from testing/postgresql-bdr/pgbdr-restore.confd
rename to main/postgresql-bdr/pgbdr-restore.confd
diff --git a/testing/postgresql-bdr/pgbdr-restore.initd b/main/postgresql-bdr/pgbdr-restore.initd
similarity index 100%
rename from testing/postgresql-bdr/pgbdr-restore.initd
rename to main/postgresql-bdr/pgbdr-restore.initd
diff --git a/testing/postgresql-bdr/postgresql-bdr-osxflags.patch b/main/postgresql-bdr/postgresql-bdr-osxflags.patch
similarity index 100%
rename from testing/postgresql-bdr/postgresql-bdr-osxflags.patch
rename to main/postgresql-bdr/postgresql-bdr-osxflags.patch
diff --git a/testing/postgresql-bdr/postgresql-bdr.confd b/main/postgresql-bdr/postgresql-bdr.confd
similarity index 100%
rename from testing/postgresql-bdr/postgresql-bdr.confd
rename to main/postgresql-bdr/postgresql-bdr.confd
diff --git a/testing/postgresql-bdr/postgresql-bdr.initd b/main/postgresql-bdr/postgresql-bdr.initd
similarity index 100%
rename from testing/postgresql-bdr/postgresql-bdr.initd
rename to main/postgresql-bdr/postgresql-bdr.initd
diff --git a/testing/postgresql-bdr/postgresql-bdr.pre-upgrade b/main/postgresql-bdr/postgresql-bdr.pre-upgrade
similarity index 100%
rename from testing/postgresql-bdr/postgresql-bdr.pre-upgrade
rename to main/postgresql-bdr/postgresql-bdr.pre-upgrade