projects / platform / upstream / nnstreamer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7d78bc0) | patch
[Merge Error Fix] Missing Merge Conflict Resolve.
authorMyungJoo Ham <myungjoo.ham@samsung.com>
Fri, 22 Jun 2018 06:32:24 +0000 (15:32 +0900)
committer함명주/동작제어Lab(SR)/Principal Engineer/삼성전자 <myungjoo.ham@samsung.com>
Fri, 22 Jun 2018 07:24:51 +0000 (16:24 +0900)
commit571a2529e06eeaf5515d403739f9762cc9299f5a
treee39e6989bd6cddb3bed959d72355bdfc377813e6tree | snapshot
parent7d78bc0ecf04f2a59554300935b12498b2611e7ccommit | diff
[Merge Error Fix] Missing Merge Conflict Resolve.

There were a few missing spots in the previous merge conflict resolve.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
gst/tensor_filter/tensor_filter.c diff | blob | history
include/tensor_typedef.h diff | blob | history
Domain: Machine Learning / ML Framework;