Commitbbe268b

committed

Fix merge conflict

2 parents26b4213 +803644e commitbbe268bCopy full SHA for bbe268b

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ num: 5`
`12`	`12`	`###ClassTags`
`13`	`13`	`###WeakTypeTags`
`14`	`14`
`15`		`-##Manifests`
	`15`	`+##Manifests`
	`16`	`+(Also mention how to get a java class from a type tag)`

Comments

(0)