Skip to content

Commit 3693e07

Browse files
committed
removed git tags from metadata
Signed-off-by: Cho Moon <[email protected]>
1 parent ac202db commit 3693e07

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

flow/designs/intel16/aes/metadata-base-ok.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@
162162
"finish_merge__mem__peak": 642396.0,
163163
"finish_merge__runtime__total": "0:11.86",
164164
"floorplan__cpu__total": 4.46,
165-
>>>>>>> origin/master
166165
"floorplan__design__core__area": 60607.3,
167166
"floorplan__design__die__area": 62500,
168167
"floorplan__design__instance__area": 4548.44,

0 commit comments

Comments
 (0)