Updated license from MIT to Apache

This commit is contained in:
Tramy Nguyen 2017-02-28 14:28:58 -07:00
parent 7dad1691ac
commit d22c71d30e

View file

@ -199,8 +199,5 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
<<<<<<< HEAD
limitations under the License.
=======
limitations under the License.
>>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git