[OpenImageIO/f16] Fix git conflict.

[Richard Shaw]

commit d728195f5a0c7cbaaf2ca3010a9b0454a65c1d77
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Jun 14 09:38:50 2012 -0500

    Fix git conflict.

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 7ee2eaa..6285f75 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0c52da04fad3333f22433bd5d52cd134  OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
-=======
 4c3955348d0232bbd2a8f60ff41ad161  OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
->>>>>>> master