Permalink
Browse files

missed a merge conflict in readme

  • Loading branch information...
1 parent 67495ae commit 45acad901c357c1f972a25881ecafa09c2515d35 @jtimberman jtimberman committed Jan 8, 2013
Showing with 2 additions and 7 deletions.
  1. +2 −7 README.md
View
@@ -225,13 +225,8 @@ Put `recipe[yum::yum]` in the run list to ensure yum is configured
correctly for your environment within your Chef run.
Use the `yum::epel` recipe to enable EPEL, or the `yum::ius` recipe to
-<<<<<<< HEAD
-enable IUS, or the `yum::repoforge` recipe to enable RepoForge, per
-__Recipes__ section above.
-=======
-enable IUS, or the `yum::remi` recipe to enable remi, per __Recipes__
-section above.
->>>>>>> [COOK-2045] Add remi repo
+enable IUS, or the `yum::repoforge` recipe to enable RepoForge, or the
+`yum::remi` recipe to enable remi per __Recipes__ section above.
You can manage GPG keys either with cookbook_file in a recipe if you
want to package it with a cookbook or use the `url` parameter of the

0 comments on commit 45acad9

Please sign in to comment.