Fixed merge conflict.

manifests/vlc.pp

@@ -19,6 +19,6 @@ class vlc::vlc {
 
   exec { 'install_vlc_requirements':
     command     => 'pip install -r /home/henfr13/django-base/requirements.txt',
-    #refreshonly => true,
+    refreshonly => true,
   }
 }