Loading css/calendar.scss +0 −13 Original line number Diff line number Diff line Loading @@ -19,18 +19,6 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ <<<<<<< HEAD @import 'app-navigation'; @import 'app-sidebar'; @import 'app-settings'; @import 'app-modal'; @import 'freebusy'; @import 'fullcalendar'; @import 'global'; @import 'import'; @import 'print'; @import 'public'; ======= @import 'app-navigation.scss'; @import 'app-sidebar.scss'; @import 'app-settings.scss'; Loading @@ -42,4 +30,3 @@ @import 'print.scss'; @import 'public.scss'; @import 'props-linkify-links.scss'; >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4 Loading
css/calendar.scss +0 −13 Original line number Diff line number Diff line Loading @@ -19,18 +19,6 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ <<<<<<< HEAD @import 'app-navigation'; @import 'app-sidebar'; @import 'app-settings'; @import 'app-modal'; @import 'freebusy'; @import 'fullcalendar'; @import 'global'; @import 'import'; @import 'print'; @import 'public'; ======= @import 'app-navigation.scss'; @import 'app-sidebar.scss'; @import 'app-settings.scss'; Loading @@ -42,4 +30,3 @@ @import 'print.scss'; @import 'public.scss'; @import 'props-linkify-links.scss'; >>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4