Merge remote-tracking branch 'mythmon/master'

uberj · Apr 4, 2012 · 8e60d4e · 8e60d4e
2 parents 8ab07d3 + 1d806b2
commit 8e60d4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/modules/git/manifests/user_config.pp b/modules/git/manifests/user_config.pp
@@ -1,7 +1,7 @@
 # $title is the name of the user this config should exist for
 define git::user_config (
   $home="/home/${title}",
-  $template="git/gitconfig.erb",
+  $template="git/gitconfig.erb"
 ) {
   file { "${title}-gitconfig":
     path    => "${home}/.gitconfig",

diff --git a/modules/puppet/manifests/user_config.pp → modules/puppet/manifests/dev/user_config.pp b/modules/puppet/manifests/user_config.pp → modules/puppet/manifests/dev/user_config.pp
diff --git a/modules/vim/manifests/user_config.pp b/modules/vim/manifests/user_config.pp
@@ -2,7 +2,7 @@
 define vim::user_config (
   $home="/home/${title}",
   $pathogen=false,
-  $template="vim/vimrc.erb",
+  $template="vim/vimrc.erb"
 ) {
   @file {
     "vim_dir_${title}":