Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- dimitriss-imac:blender kilon$ git diff
- diff --cc COPYING
- index 6f54e8d,ec11271..0000000
- --- a/COPYING
- +++ b/COPYING
- @@@ -8,3 -8,5 +8,8 @@@ Apart from the GNU GPL, Blender is not
- 2010, Blender Foundation
- ++<<<<<<< HEAD
- ++=======
- +
- + fffff
- ++>>>>>>> new
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
