diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:23:44 +0100 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:23:44 +0100 |
commit | cfc0348e120df881461ada2d3299f0fb4314f49e (patch) | |
tree | 2e52040fb3437146c77f1dbe6a33442a4ed71b4a /test/data | |
parent | 60e610ebdd86663bedf113d2235ac3c8364171d0 (diff) | |
parent | faad901ed29f802d7b304c06ae62954b149960e7 (diff) | |
download | dokka-cfc0348e120df881461ada2d3299f0fb4314f49e.tar.gz dokka-cfc0348e120df881461ada2d3299f0fb4314f49e.tar.bz2 dokka-cfc0348e120df881461ada2d3299f0fb4314f49e.zip |
Merge branch 'property-var'
Conflicts:
test/src/format/MarkdownFormatTest.kt
Diffstat (limited to 'test/data')
-rw-r--r-- | test/data/format/propertyVar.kt | 1 | ||||
-rw-r--r-- | test/data/format/propertyVar.md | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/data/format/propertyVar.kt b/test/data/format/propertyVar.kt new file mode 100644 index 00000000..88be1a7a --- /dev/null +++ b/test/data/format/propertyVar.kt @@ -0,0 +1 @@ +var x = 1
\ No newline at end of file diff --git a/test/data/format/propertyVar.md b/test/data/format/propertyVar.md new file mode 100644 index 00000000..6b14fca3 --- /dev/null +++ b/test/data/format/propertyVar.md @@ -0,0 +1,12 @@ +[test](out.md) / [](out.md) / [x](out.md) + + +# x + + +``` +var x: Int +``` + + + |