summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-06-17 10:06:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-17 10:06:13 +0000
commite2fd77acc2ac7c2ae24ab76144201906839f26a8 (patch)
tree1112523f3ab23615d073d78d220eb208e009ceed
parent1b9e194e59a3156a82ca93cd0a2cf11360f362a9 (diff)
parentcf636e69756334bd6214488ef2261dea3979b1b3 (diff)
Merge "fix format problem"
-rwxr-xr-xdocs/com/pres/conversation.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/com/pres/conversation.html b/docs/com/pres/conversation.html
index 0fab448a2..d876e17e2 100755
--- a/docs/com/pres/conversation.html
+++ b/docs/com/pres/conversation.html
@@ -118,10 +118,10 @@
* Performance testing framework and NFVI Validation
* [Contributors](https://wiki.opnfv.org/display/yardstick/People)
* Yardstick presentation
- * How to Do a Pre-deployment NFVI Validation Quickly and Efficiently? Wednesday, June 22, 4:00 PM - 4:30 PM
- * Yardstick: A Pre-deployment NFVI Validation Tool. Thursday, June 23, 3:10 PM - 3:30 PM
+ * How to Do a Pre-deployment NFVI Validation Quickly and Efficiently? Wednesday, June 22, 4:00 PM - 4:30 PM
+ * Yardstick: A Pre-deployment NFVI Validation Tool. Thursday, June 23, 3:10 PM - 3:30 PM
* breakout sessions
- * Tomorrow 2PM (Yardstick in C)
+ * Tomorrow 2PM (Yardstick in C)
</section>
<section data-markdown>
# CPerf