| commit | fd43925e7724913c0e6fed6fc8f64e993ef15254 | [log] [tgz] |
|---|---|---|
| author | akmhoque <akmhoque@gmail.com> | Thu Feb 21 13:38:23 2013 -0600 |
| committer | akmhoque <akmhoque@gmail.com> | Thu Feb 21 13:38:23 2013 -0600 |
| tree | 76d9239a6ab28968a4d1a4557d2ed8b1e1aa4c1d | |
| parent | 0c267013699a50848d9d2f705989e4fdf15c48ff [diff] |
Formatting nlsr_lsdb
diff --git a/nlsr_sync.c b/nlsr_sync.c index d523bed..a7a130c 100644 --- a/nlsr_sync.c +++ b/nlsr_sync.c
@@ -141,11 +141,7 @@ -<<<<<<< HEAD -void -======= - void ->>>>>>> 806df81f471eddcdef48b2ab64eaec8aaca2e69c +void get_name_part(struct name_prefix *name_part,struct ccn_charbuf * interest_ccnb, struct ccn_indexbuf *interest_comps, int offset) {