profile: resolving conflicts

This commit is contained in:
Zero_Chaos 2012-06-08 04:26:51 +00:00
parent e6e5908b0e
commit e22682938f
2 changed files with 3 additions and 0 deletions

View file

@ -0,0 +1 @@
2

View file

@ -0,0 +1,2 @@
gentoo:default/linux/amd64/10.0
:pentoo/common