resolve merge conflict

diff --cc buildtools/Cmake/DefinePackages.cmake
index 95a15b7,50cfb56..ec1a1f0
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -84,17 -85,6 +84,7 @@@ set(EXTRA_DIS
        src/smpi/README
        src/mk_supernovae.pl
        
-       examples/gras/ping/ping.h
-       examples/gras/console/ping.h
-       examples/gras/mmrpc/mmrpc.h
-       
-     examples/msg/mc/bugged1_liveness.h
-     examples/msg/mc/centralized_liveness.h
-     examples/msg/mc/bugged2_liveness.h
-     examples/msg/mc/y.tab.h
- 
-     examples/platforms/content/storage_content.txt
 +
        tools/gras/gras_stub_generator.h
        tools/tesh/run_context.h  
        tools/tesh/tesh.h