Avoid merge conflict over Id SVN tag

todb · todb · commit 418a373f6c05 · 2013-03-18T15:39:16.000-05:00
diff --git a/lib/msf/util/exe.rb b/lib/msf/util/exe.rb
@@ -1,21 +1,13 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
-###
-#
-# framework-util-exe
-# --------------
+module Msf
+module Util
+
 #
 # The class provides methods for creating and encoding executable file
 # formats for various platforms. It is a replacement for the previous
 # code in Rex::Text
 #
-###
-
-module Msf
-module Util
 class EXE
 
 require 'rex'
