Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts.

Browse Source
This commit is contained in:
akwizgran
2018-05-07 14:37:32 +00:00
parent a3b5ff0bc0 2908145a06
commit 286937e472
8 changed files with 382 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java
View File

@@ -8,7 +8,7 @@ public interface TestDataCreator {
/**
* Create fake test data on the DatabaseExecutor
*
* @param numContacts Number of contacts to create.
* @param numContacts Number of contacts to create. Must be >= 1
* @param numPrivateMsgs Number of private messages to create for each
* contact.
* @param numBlogPosts Number of blog posts to create.