github-migration/master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed merged code commented

Browse Source
This commit is contained in:
Thibaud Guillaume-Gentil 2011-06-02 23:58:07 +02:00
parent fb5caf43f6
commit 5808a3cf23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/guard/listener.rb
View File

@ -47,10 +47,6 @@ module Guard
end
def modified_files(dirs, options = {})
# <<<<<<< HEAD
# files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
# files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
# =======
files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
relativate_paths files
end
@ -66,7 +62,6 @@ module Guard
def all_files
potentially_modified_files [directory + '/'], :all => true
# >>>>>>> b12769d2bf385b3c69973721144cae3d5d8fbed9
end
# scopes all given paths to the current #directory