resolved merge conflicts

examples/pinproctest/Example.yaml

@@ -0,0 +1,7 @@
+PRGameName: My Great Pin
+PRDrivers:
+    1: driver one
+    2: driver two
+PRSwitches:
+    1: switch one
+    2: switch two

examples/pinproctest/Makefile

@@ -2,8 +2,8 @@
 # File:  Makefile for application
 #
 CC=g++
-LDFLAGS=-L../.. -L/usr/local/lib
-LIBS=-lpinproc -lusb -lftdi
+LDFLAGS=-L../.. -L/usr/local/lib -L../../../../yaml-cpp/build/bin
+LIBS=-lpinproc -lusb -lftdi -lyaml-cpp
 
 SRC=pinproctest.cpp
 

examples/pinproctest/pinproctest.cpp

@@ -306,6 +306,7 @@ int main(const char **argv, int argc)
         return 1;
 
     printf("Configuring P-ROC...\n");
+    PRLoadDefaultsFromYAML(proc, "../../examples/pinproctest/Example.yaml");
 
     ConfigureDMD(proc); 
     ConfigureSwitches(proc); // Notify host for all debounced switch events.