From e22682938fdd2028773ab8f361aa583a8f8f7770 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Fri, 8 Jun 2012 04:26:51 +0000
Subject: [PATCH] profile: resolving conflicts

---
 profiles/pentoo/default/linux/amd64/eapi   | 1 +
 profiles/pentoo/default/linux/amd64/parent | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 profiles/pentoo/default/linux/amd64/eapi
 create mode 100644 profiles/pentoo/default/linux/amd64/parent

diff --git a/profiles/pentoo/default/linux/amd64/eapi b/profiles/pentoo/default/linux/amd64/eapi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/profiles/pentoo/default/linux/amd64/eapi
@@ -0,0 +1 @@
+2
diff --git a/profiles/pentoo/default/linux/amd64/parent b/profiles/pentoo/default/linux/amd64/parent
new file mode 100644
index 000000000..095494e87
--- /dev/null
+++ b/profiles/pentoo/default/linux/amd64/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/10.0
+:pentoo/common