ref: refs/heads/use-activeresource
commit b58d4ea1dd5b05ffab28eb221caffe7c5d17f027
Author: Martin Kudlvasr
Date: Wed Sep 16 16:40:35 2009 +0200
fix merge
---
.../network/app/controllers/network_controller.rb | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/plugins/network/app/controllers/network_controller.rb b/plugins/network/app/controllers/network_controller.rb
index 66b2ab7..99e632b 100644
--- a/plugins/network/app/controllers/network_controller.rb
+++ b/plugins/network/app/controllers/network_controller.rb
@@ -10,7 +10,6 @@ class NetworkController < ApplicationController
layout 'main'
include ProxyLoader
-<<<<<<< HEAD:plugins/network/app/controllers/network_controller.rb
private
@@ -38,8 +37,6 @@ class NetworkController < ApplicationController
end
@permissions = @network.permissions
end
-=======
->>>>>>> 9e625348bad10abe8f88e0d63143ce6177bd99f0:plugins/network/app/controllers/network_controller.rb
# Initialize GetText and Content-Type.
init_gettext "yast_webclient_network"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org