+++ /dev/null
-#!/usr/bin/perl -w
-use warnings;
-no warnings "portable";
-use Getopt::Long;
-use Data::Dumper;
-use Time::HiRes qw(usleep);
-use lib '.';
-use MDC;
-use MDCPower;
-
-
-# my($host,$board,$output,$channel,$command,$value)
-<<<<<<< HEAD:scripts/testpb.pl
-print(MDCPower::powerboard_command("mdcpd052",-1,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("mdcpd052",0,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("mdcpd052",0,0,0,"curr")."\n");
-print(MDCPower::powerboard_command("mdcpd052",0,0,0,"vin")."\n");
-=======
-
-# while(1) {
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"curr")."\n");
-# sleep 5;
-# }
-
-print(MDCPower::powerboard_command("192.168.0.12",0,1,0,"switch",1)."\n");
-print(MDCPower::powerboard_command("192.168.0.12",-1,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"curr")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"vin")."\n");
->>>>>>> 4fbe5b9db0a20236f4e6a01875155b92278e2f7f:scripts/test/testpb.pl