diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/sources | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/mesa/sources b/src/mesa/sources index 9278ca88e9..9a34d1a989 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -299,9 +299,4 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o) INCLUDE_DIRS = \ -I$(TOP)/include \ -<<<<<<< HEAD:src/mesa/sources -I$(TOP)/src/mesa -======= - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main ->>>>>>> master:src/mesa/sources |