projects
/
apps
/
home
/
smartsearch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
391e76e
)
Remove unused file
author
Junghyun Kim
<jh1114.kim@samsung.com>
Mon, 4 Feb 2013 05:47:43 +0000
(14:47 +0900)
committer
Junghyun Kim
<jh1114.kim@samsung.com>
Mon, 4 Feb 2013 05:47:43 +0000
(14:47 +0900)
NOTICE.Flora
[deleted file]
patch
|
blob
|
history
diff --git
a/NOTICE.Flora
b/NOTICE.Flora
deleted file mode 100755
(executable)
index
eeb9180
..0000000
--- a/
NOTICE.Flora
+++ /dev/null
@@
-1,8
+0,0 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE file for Flora License terms and conditions.
-<<<<<<< HEAD
-=======
-
-
->>>>>>> master