Showing
2 changed files
with
4 additions
and
0 deletions
This diff is collapsed. Click to expand it.
1 | +<<<<<<< HEAD | ||
1 | # Saved by TopBraid on Mon Sep 26 15:17:53 BST 2011 | 2 | # Saved by TopBraid on Mon Sep 26 15:17:53 BST 2011 |
3 | +======= | ||
4 | +# Saved by TopBraid on Mon Sep 26 15:36:29 BST 2011 | ||
5 | +>>>>>>> fixScale | ||
2 | # baseURI: null | 6 | # baseURI: null |
3 | 7 | ||
4 | @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . | 8 | @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . | ... | ... |
-
Please register or login to post a comment