commit 0453dbb398c487818eb47228e4f7a40dd7319ae2
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Apr 28 22:39:17 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 22 11:43:46 2020 -0700
tree 189fcb0475268279fc1b5eb26fa243a95cc79330
parent a67fa4648f385e1f41de29992583b2904f493b71

Update CaConfig and ClientCaItem. Add INFO packet encoding and decoding.

Change-Id: I2118bfee05640ddbf20643fa07bf4c91eb7ebd06

src/certificate-request.hpp

diff --git a/src/certificate-request.hpp b/src/certificate-request.hpp
index c8de2ee..d44316c 100644
--- a/src/certificate-request.hpp
+++ b/src/certificate-request.hpp
@@ -22,7 +22,14 @@
 #define NDNCERT_CERTIFICATE_REQUEST_HPP
 
 #include "ndncert-common.hpp"
+<<<<<<< HEAD
 #include <ndn-cxx/security/certificate.hpp>
+=======
+#include <ndn-cxx/security/v2/certificate.hpp>
+#include <boost/property_tree/info_parser.hpp>
+#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+>>>>>>> Update CaConfig and ClientCaItem. Add INFO packet encoding and decoding.
 
 namespace ndn {
 namespace ndncert {