Resolve more merge issues from Ricky's commit

jnraine · Aug 17, 2011 · 0fa5a7d · 0fa5a7d
1 parent e515de2
commit 0fa5a7d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -7,6 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
 
-include Rake::DSL
-
 Munki::Application.load_tasks
diff --git a/app/views/packages/_edit_package_tabs.html.erb b/app/views/packages/_edit_package_tabs.html.erb
@@ -112,7 +112,6 @@
 					See Force Install After Date documentation for more information.') %>
 				</td>
 			</tr>
-
 			<tr>
 				<td colspan="2">
 					<h4>Description</h4>

diff --git a/public/assets b/public/assets
@@ -0,0 +1 @@
+../../munkiserver_assets/