tree da7918898cd980ad1a478b3266535b10c9c05885
parent e617c9ab09c70c45ad098c68e709787d0783f908
author Ed Tanous <ed.tanous@intel.com> 1515783026 -0800
committer Ed Tanous <ed.tanous@intel.com> 1515796808 -0800

Fix merge error introduced with base64.hpp deletion

Change-Id: If1e194009cec31c593e4a0f89c875a3e3bd84110