Commit e4426b97 authored by guhaoyu2005's avatar guhaoyu2005
Browse files

tweak

parent c9e19b2a
...@@ -59,7 +59,6 @@ else ...@@ -59,7 +59,6 @@ else
cat test.log cat test.log
fi fi
rm -f test.log rm -f test.log
<<<<<<< HEAD
exit exit
# Test data/image.20 # Test data/image.20
...@@ -516,5 +515,3 @@ else ...@@ -516,5 +515,3 @@ else
cat test.log cat test.log
fi fi
rm -f test.log rm -f test.log
=======
>>>>>>> orig/master
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment