FizzBuzz git Merge Exercise

FizzBuzz_1.cpp

#include <iostream>

int main(int argc, char *argv[]) {
    for(unsigned int i = 0; i < 100; i++) {
        std::cout << i << std::endl;
    }
    
    return(0);
}

FizzBuzz_1.java

public class FizzBuzz {
    public static void main(String[] args) {
        for(int i = 0; i < 100; i++) {
            System.out.println(i);
        }
    }
}

FizzBuzz_2Alice.cpp

#include <iostream>

int main(int argc, char *argv[]) {
	for(unsigned int i = 0; i < 100; i++) {
		if( i % 3 == 0)
			std::cout << i << ": " << "Fizz" << std::endl;
	}
	
	return(0);
}

FizzBuzz_2Alice.java

public class FizzBuzz {
    public static void main(String[] args) {
        for(int i = 0; i < 100; i++) {
            if( i % 3 == 0)
                System.out.println(i + ": " + "Fizz");
        }
    }
}

FizzBuzz_2Bob.cpp

#include <iostream>

int main(int argc, char *argv[]) {
	for(unsigned int i = 0; i < 100; i++) {
		if( i % 5 == 0)
			std::cout << i << ": " << "Buzz" << std::endl;
	}
	
	return(0);
}

FizzBuzz_2Bob.java

public class FizzBuzz {
    public static void main(String[] args) {
        for(int i = 0; i < 100; i++) {
            if( i % 5 == 0)
                System.out.println("Buzz");
        }
    }
}

FizzBuzz_Unmerged.cpp

#include <iostream>

int main(int argc, char *argv[]) {
	for(unsigned int i = 0; i < 100; i++) {
<<<<<<< HEAD
		if( i % 3 == 0)
			std::cout << i << ": " << "Fizz" << std::endl;
=======
		if( i % 5 == 0)
			std::cout << i << ": " << "Buzz" << std::endl;
>>>>>>> d65d06f2547163e6a1d37d82fc5b283a010934eb
	}
	
	return(0);
}

FizzBuzz_Unmerged.java

public class FizzBuzz {
    public static void main(String[] args) {
        for(int i = 0; i < 100; i++) {
<<<<<<< HEAD
            if( i % 3 == 0)
                System.out.println("Fizz");
=======
            if( i % 5 == 0)
                System.out.println("Buzz");
>>>>>>> d65d06f2547163e6a1d37d82fc5b283a010934eb
        }
    }
}