API tools faq
paste
Advertisement
kilon

Untitled

kilon
Jan 27th, 2013
110
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.29 KB | None | 0 0
raw download clone embed print report
  1. dimitriss-imac:blender kilon$ git diff
  2. diff --cc COPYING
  3. index 6f54e8d,ec11271..0000000
  4. --- a/COPYING
  5. +++ b/COPYING
  6. @@@ -8,3 -8,5 +8,8 @@@ Apart from the GNU GPL, Blender is not
  7.  
  8. 2010, Blender Foundation
  9. foundation@blender.org
  10. ++<<<<<<< HEAD
  11. ++=======
  12. +
  13. + fffff
  14. ++>>>>>>> new
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!