Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2

# Conflicts: # lab2CA.xpr
2019-03-24 16:06:29 -04:00
parent e8ada91e08 eac5d71dd6
commit ace0eca65a
3 changed files with 32 additions and 24 deletions
--- a/lab2CA.xpr
+++ b/lab2CA.xpr
@@ -3,7 +3,11 @@
 <!--                                                         -->
 <!-- Copyright 1986-2018 Xilinx, Inc. All Rights Reserved.   -->

+<<<<<<< HEAD
 <Project Version="7" Minor="39" Path="C:/Users/ecelab/ECE3570-Lab/lab2CA.xpr">
+=======
+<Project Version="7" Minor="39" Path="C:/REPOSITORIES/Educational/Western Michigan University/ECE3570-Lab/lab2CA.xpr">
+>>>>>>> eac5d71dd65c2eb38e5151a1cdc30860d1430018
  <DefaultLaunch Dir="$PRUNDIR"/>
  <Configuration>
    <Option Name="Id" Val="0a5803efda44405bb28bbf43ba22e808"/>