diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-03 06:00:54 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-03 06:00:54 +0000 |
commit | 6c288fe84a865a20c7bc9ba5eea4d65ab38b4358 (patch) | |
tree | 90620ae3e6f9565cb1f484a1c88ede6245c2b57a /ext/tk | |
parent | c1c4b6b501388ab8e556b6ced4a4822bdbb70249 (diff) | |
download | ruby-6c288fe84a865a20c7bc9ba5eea4d65ab38b4358.tar.gz |
* sorry. fixed commit miss
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/lib/tk.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index dcbaeea15c..d282bbd5ea 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1839,17 +1839,10 @@ class TkVariable string(value).to_s end -<<<<<<< tk.rb - def to_symbol - value.intern - end - -======= def to_sym value.intern end ->>>>>>> 1.73 def inspect format "#<TkVariable: %s>", @id end @@ -1860,13 +1853,8 @@ class TkVariable self.equal?(other) when String self.to_s == other -<<<<<<< tk.rb - when Symbol - self.to_symbol == other -======= when Symbol self.to_sym == other ->>>>>>> 1.73 when Integer self.to_i == other when Float |